Attachment 194169 Details for Bug 228887 – patch-v2

[patch] patch-v2

leofs.diff (text/plain), 11.87 KB, created by Kurt Jaeger on 2018-06-11 14:12:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2018-06-11 14:12:20 UTC

Size: 11.87 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 472164)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	leofs
>-PORTVERSION=	1.3.8
>+PORTVERSION=	1.4.1
> CATEGORIES=	databases
> DIST_SUBDIR=	${PORTNAME}
> 
>@@ -11,7 +11,7 @@
> 
> LICENSE=	APACHE20
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/erlang18/bin/erlc:lang/erlang-runtime18 \
>+BUILD_DEPENDS=	${LOCALBASE}/lib/erlang20/bin/erlc:lang/erlang-runtime20 \
> 		${LOCALBASE}/bin/cmake:devel/cmake \
> 		${LOCALBASE}/lib/libcheck.a:devel/check
> 
>@@ -63,7 +63,7 @@
> 
> ALL_TARGET=	release
> MAKE_JOBS_UNSAFE=yes
>-MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang18/bin:${PATH}
>+MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang20/bin:${PATH}
> 
> LEOFS_DEPS=	\
> 	DeadZen/goldrush=0.1.9:goldrush \
>@@ -85,22 +85,22 @@
> 	leo-project/erpcgen=0.2.6:erpcgen \
> 	leo-project/folsom=0.8.2-p1:folsom \
> 	leo-project/lager=574d64a:lager \
>-	leo-project/leo_backend_db=1.2.24:leo_backend_db \
>-	leo-project/leo_cache=0.8.7:leo_cache \
>-	leo-project/leo_commons=1.1.12:leo_commons \
>-	leo-project/leo_dcerl=0.4.8:leo_dcerl \
>-	leo-project/leo_logger=1.3.4:leo_logger \
>+	leo-project/leo_backend_db=1.2.30:leo_backend_db \
>+	leo-project/leo_cache=0.8.10:leo_cache \
>+	leo-project/leo_commons=1.2.0:leo_commons \
>+	leo-project/leo_dcerl=0.4.9:leo_dcerl \
>+	leo-project/leo_logger=1.3.7:leo_logger \
> 	leo-project/leo_mcerl=0.6.6:leo_mcerl \
>-	leo-project/leo_mq=1.5.12:leo_mq \
>-	leo-project/leo_object_storage=1.3.21:leo_object_storage \
>-	leo-project/leo_ordning_reda=1.2.8:leo_ordning_reda \
>+	leo-project/leo_mq=1.5.17:leo_mq \
>+	leo-project/leo_object_storage=1.3.34:leo_object_storage \
>+	leo-project/leo_ordning_reda=1.2.10:leo_ordning_reda \
> 	leo-project/leo_pod=0.6.9:leo_pod \
>-	leo-project/leo_redundant_manager=1.9.55:leo_redundant_manager \
>-	leo-project/leo_rpc=0.10.15:leo_rpc \
>-	leo-project/leo_s3_libs=1.2.16:leo_s3_libs \
>-	leo-project/leo_statistics=1.1.20:leo_statistics \
>-	leo-project/leo_tran=0.2.11:leo_tran \
>-	leo-project/leo_watchdog=1.0.4:leo_watchdog \
>+	leo-project/leo_redundant_manager=1.9.60:leo_redundant_manager \
>+	leo-project/leo_rpc=0.10.17:leo_rpc \
>+	leo-project/leo_s3_libs=1.2.19:leo_s3_libs \
>+	leo-project/leo_statistics=1.1.22:leo_statistics \
>+	leo-project/leo_tran=0.2.13:leo_tran \
>+	leo-project/leo_watchdog=1.0.6:leo_watchdog \
> 	leo-project/libcutil=0.4.5:libcutil \
> 	leo-project/nfs_rpc_server=0.2.6:nfs_rpc_server \
> 	leo-project/savanna_agent=0.4.23:savanna_agent \
>@@ -107,6 +107,7 @@
> 	leo-project/savanna_commons=0.10.9:savanna_commons \
> 	manopapad/proper=f558989:proper \
> 	ninenines/cowlib=1.0.0:cowlib \
>+	systemd/erlang-sd_notify=v1.0:sd_notify \
> 
> GH_TUPLE=	${LEOFS_DEPS:C,(.*)/(.*)=(.*):(.*),\1:\2:\3:\4/deps/\4,}
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 472164)
>+++ distinfo	(working copy)
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1511987945
>-SHA256 (leofs/leo-project-leofs-1.3.8_GH0.tar.gz) = 370e671c740f9d9448af6fed1a1c92395ffd1102ab81117704dc5e244c9ffa2a
>-SIZE (leofs/leo-project-leofs-1.3.8_GH0.tar.gz) = 6564735
>+TIMESTAMP = 1528719011
>+SHA256 (leofs/leo-project-leofs-1.4.1_GH0.tar.gz) = 83497395f0618fb03f8710075b122d7ed8c52d1ba208d4328dca8494fe9228bc
>+SIZE (leofs/leo-project-leofs-1.4.1_GH0.tar.gz) = 6733828
> SHA256 (leofs/DeadZen-goldrush-0.1.9_GH0.tar.gz) = 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612
> SIZE (leofs/DeadZen-goldrush-0.1.9_GH0.tar.gz) = 24548
> SHA256 (leofs/basho-eleveldb-2.0.33_GH0.tar.gz) = 9a12167068f20bd61e23f29708a5ee73d5a33e14ee30ad1cb8390ecf4ab9a22c
>@@ -27,8 +27,8 @@
> SIZE (leofs/leo-project-bear-0.8.2-for-leofs_GH0.tar.gz) = 110538
> SHA256 (leofs/leo-project-bitcask-2.0.8.3-for-leofs_GH0.tar.gz) = 1192a5913828362c49b52af3298577f7d94768f4bbcfc7b593776bd2772e873e
> SIZE (leofs/leo-project-bitcask-2.0.8.3-for-leofs_GH0.tar.gz) = 968739
>-SHA256 (leofs/leo-project-cowboy-for-leofs-1.4_GH0.tar.gz) = 6d1fc7938c6fc42e457fe4818a19f918ae08d294aec8908df42e59258d00d4e1
>-SIZE (leofs/leo-project-cowboy-for-leofs-1.4_GH0.tar.gz) = 4829696
>+SHA256 (leofs/leo-project-cowboy-for-leofs-1.4_GH0.tar.gz) = 3ba3860c574a6f2703f1aa0593ce861032108c67f7d4ff8593da3aa1ee08b9aa
>+SIZE (leofs/leo-project-cowboy-for-leofs-1.4_GH0.tar.gz) = 4829758
> SHA256 (leofs/leo-project-cuttlefish-04a8442_GH0.tar.gz) = d13944b6fbddb370046e0c33e78c15ea2ac765db305d03168f8ddc510323d998
> SIZE (leofs/leo-project-cuttlefish-04a8442_GH0.tar.gz) = 232859
> SHA256 (leofs/leo-project-erlpass-612f487_GH0.tar.gz) = 0eb108db05427fb819c6ca1aa63f5cb81596c7971ad1d3f58766ad503f9bc8a4
>@@ -39,38 +39,38 @@
> SIZE (leofs/leo-project-folsom-0.8.2-p1_GH0.tar.gz) = 174988
> SHA256 (leofs/leo-project-lager-574d64a_GH0.tar.gz) = b6ad1f35406115dba1cdf4cd1f065ecb586354e7b5b57f3243f9ec7674aac165
> SIZE (leofs/leo-project-lager-574d64a_GH0.tar.gz) = 259253
>-SHA256 (leofs/leo-project-leo_backend_db-1.2.24_GH0.tar.gz) = 8767c7346853579e97a98c07fba4b585ce65ea29b5adb41b3adf484a6e7a699e
>-SIZE (leofs/leo-project-leo_backend_db-1.2.24_GH0.tar.gz) = 197204
>-SHA256 (leofs/leo-project-leo_cache-0.8.7_GH0.tar.gz) = 84385375bcab81dff9a885f0b066878ead1e736f846791637206d95c68271a9c
>-SIZE (leofs/leo-project-leo_cache-0.8.7_GH0.tar.gz) = 187900
>-SHA256 (leofs/leo-project-leo_commons-1.1.12_GH0.tar.gz) = 994151b5825bc63211535e9b14f2b1b342f8861a30ebd3a56355ef1880eadb69
>-SIZE (leofs/leo-project-leo_commons-1.1.12_GH0.tar.gz) = 203491
>-SHA256 (leofs/leo-project-leo_dcerl-0.4.8_GH0.tar.gz) = 327fd192ef2dba01da1c86f0c1a16e5f4fdbecb839e6bee8a1ff93a32eec7aac
>-SIZE (leofs/leo-project-leo_dcerl-0.4.8_GH0.tar.gz) = 192883
>-SHA256 (leofs/leo-project-leo_logger-1.3.4_GH0.tar.gz) = ae655fe95055747b0ebcd88b70463d63c4d8de8b760bce3e0799bedc53f18778
>-SIZE (leofs/leo-project-leo_logger-1.3.4_GH0.tar.gz) = 199733
>+SHA256 (leofs/leo-project-leo_backend_db-1.2.30_GH0.tar.gz) = d37e691c2415cb389bd4a2d018e7ae4312466186ae17c8a3064ebb193a6fbbd3
>+SIZE (leofs/leo-project-leo_backend_db-1.2.30_GH0.tar.gz) = 197528
>+SHA256 (leofs/leo-project-leo_cache-0.8.10_GH0.tar.gz) = f55f9f34b9e78d66309b5e4e75e1a4fffc9beb9f82427e88c98cd7472daa4392
>+SIZE (leofs/leo-project-leo_cache-0.8.10_GH0.tar.gz) = 187903
>+SHA256 (leofs/leo-project-leo_commons-1.2.0_GH0.tar.gz) = dbadcc92619a2e9a0681e558f479978d804e2db228170f3ae2609cdadac4ad72
>+SIZE (leofs/leo-project-leo_commons-1.2.0_GH0.tar.gz) = 216180
>+SHA256 (leofs/leo-project-leo_dcerl-0.4.9_GH0.tar.gz) = 52c70223a2493c9daa9aaa044fb9b4ee100ac2e88f5db3cfae15153a56b8fee3
>+SIZE (leofs/leo-project-leo_dcerl-0.4.9_GH0.tar.gz) = 192890
>+SHA256 (leofs/leo-project-leo_logger-1.3.7_GH0.tar.gz) = 30649b16853ac79af45c0ab5a5544f471a7510d2ea639c6e168cdc08970aea71
>+SIZE (leofs/leo-project-leo_logger-1.3.7_GH0.tar.gz) = 199985
> SHA256 (leofs/leo-project-leo_mcerl-0.6.6_GH0.tar.gz) = fe939b754a6523e9291952162991410bae7c5783cb865a16d9b7a27304482b0e
> SIZE (leofs/leo-project-leo_mcerl-0.6.6_GH0.tar.gz) = 185314
>-SHA256 (leofs/leo-project-leo_mq-1.5.12_GH0.tar.gz) = ee1062f7128ce70d6cf4ccdad4c4a76fa3a5038586051a8dd3e6534a1a94101d
>-SIZE (leofs/leo-project-leo_mq-1.5.12_GH0.tar.gz) = 195286
>-SHA256 (leofs/leo-project-leo_object_storage-1.3.21_GH0.tar.gz) = ab4a0b7b04695f517d0195e6dc7e6c6b600178cab0b62a75c37b426b7ce0cfc8
>-SIZE (leofs/leo-project-leo_object_storage-1.3.21_GH0.tar.gz) = 587121
>-SHA256 (leofs/leo-project-leo_ordning_reda-1.2.8_GH0.tar.gz) = c555770a0dc70349dd59c8acd27c28b582268de124351998deb2338aa8bf3d49
>-SIZE (leofs/leo-project-leo_ordning_reda-1.2.8_GH0.tar.gz) = 190567
>+SHA256 (leofs/leo-project-leo_mq-1.5.17_GH0.tar.gz) = b1d679f5976a3edb133c1e96f68547216ff159d270d6c501bade6082934b77a7
>+SIZE (leofs/leo-project-leo_mq-1.5.17_GH0.tar.gz) = 195147
>+SHA256 (leofs/leo-project-leo_object_storage-1.3.34_GH0.tar.gz) = 8f3d4a677364920187c83d923ac1ad7d12504a86cdfd45ca2915da6ce247d9e0
>+SIZE (leofs/leo-project-leo_object_storage-1.3.34_GH0.tar.gz) = 589485
>+SHA256 (leofs/leo-project-leo_ordning_reda-1.2.10_GH0.tar.gz) = c33f6567e394dc8a0801c232b0c952193c06c2aa339e4e5cb2b2d7a767b0afee
>+SIZE (leofs/leo-project-leo_ordning_reda-1.2.10_GH0.tar.gz) = 190576
> SHA256 (leofs/leo-project-leo_pod-0.6.9_GH0.tar.gz) = 55a61bd7c24a411b77149d194676cfefb00d1d1b9f847e2473ce952d8e0b410d
> SIZE (leofs/leo-project-leo_pod-0.6.9_GH0.tar.gz) = 170688
>-SHA256 (leofs/leo-project-leo_redundant_manager-1.9.55_GH0.tar.gz) = 6ff82ad0b6fc516f173bfe79111ab0224300878fc877401ef582bb5b10fe01d0
>-SIZE (leofs/leo-project-leo_redundant_manager-1.9.55_GH0.tar.gz) = 240518
>-SHA256 (leofs/leo-project-leo_rpc-0.10.15_GH0.tar.gz) = 9edd002096e5c939f42f6997fd4333a5081095093e39051936288980b556583a
>-SIZE (leofs/leo-project-leo_rpc-0.10.15_GH0.tar.gz) = 197784
>-SHA256 (leofs/leo-project-leo_s3_libs-1.2.16_GH0.tar.gz) = ea8dc4e1c872f3b710fb38e738c00b4a51cffa4e8d59954f7e0786a6539d399a
>-SIZE (leofs/leo-project-leo_s3_libs-1.2.16_GH0.tar.gz) = 210991
>-SHA256 (leofs/leo-project-leo_statistics-1.1.20_GH0.tar.gz) = db4350f7d93eefb3d4585080a4c4d8bd1b19d14f1b07b9843c549ffc46a78587
>-SIZE (leofs/leo-project-leo_statistics-1.1.20_GH0.tar.gz) = 190442
>-SHA256 (leofs/leo-project-leo_tran-0.2.11_GH0.tar.gz) = facf7a242c5b3f376c68cf891097ef2898ced2a9b1201b07ebe68d63b816f45e
>-SIZE (leofs/leo-project-leo_tran-0.2.11_GH0.tar.gz) = 188380
>-SHA256 (leofs/leo-project-leo_watchdog-1.0.4_GH0.tar.gz) = b06a45c6e68a5970b809041f21ac26c0c4bb5b2125b8bc0d867a842232f5f0be
>-SIZE (leofs/leo-project-leo_watchdog-1.0.4_GH0.tar.gz) = 201404
>+SHA256 (leofs/leo-project-leo_redundant_manager-1.9.60_GH0.tar.gz) = 078c1d226f607a2302d53b9327195fffb2610dd33fbd4f6643725f9def5904f9
>+SIZE (leofs/leo-project-leo_redundant_manager-1.9.60_GH0.tar.gz) = 240513
>+SHA256 (leofs/leo-project-leo_rpc-0.10.17_GH0.tar.gz) = 92be948629e94c3d16706e20c9e0e5960b7a452ff86c0e72c30082cdfe34be16
>+SIZE (leofs/leo-project-leo_rpc-0.10.17_GH0.tar.gz) = 197780
>+SHA256 (leofs/leo-project-leo_s3_libs-1.2.19_GH0.tar.gz) = 144c1e8db73833ff658524925b66e866051ddf66a3032f0ab0af66ab83fc6233
>+SIZE (leofs/leo-project-leo_s3_libs-1.2.19_GH0.tar.gz) = 211659
>+SHA256 (leofs/leo-project-leo_statistics-1.1.22_GH0.tar.gz) = d304a57a756821a4f624efbc195da8d1e28e50e4c60497c1e1719f523a67728b
>+SIZE (leofs/leo-project-leo_statistics-1.1.22_GH0.tar.gz) = 190440
>+SHA256 (leofs/leo-project-leo_tran-0.2.13_GH0.tar.gz) = 01d7eb2714c323457710a59dffdf628cf7b597243ac8e50e694354d33d6c95d8
>+SIZE (leofs/leo-project-leo_tran-0.2.13_GH0.tar.gz) = 188391
>+SHA256 (leofs/leo-project-leo_watchdog-1.0.6_GH0.tar.gz) = 8a5aef0d65cf92af381e75d990b062838b8cd1d2d38d1428544c3f060bddab72
>+SIZE (leofs/leo-project-leo_watchdog-1.0.6_GH0.tar.gz) = 201409
> SHA256 (leofs/leo-project-libcutil-0.4.5_GH0.tar.gz) = 48bcbe7492eaf47785e7628cb6e0793187c21e427720cf73b8800f735e4df5d4
> SIZE (leofs/leo-project-libcutil-0.4.5_GH0.tar.gz) = 23873
> SHA256 (leofs/leo-project-nfs_rpc_server-0.2.6_GH0.tar.gz) = 5cc3785df660774d5bd11175be0da804663913b3c585ed5f7ea57120b7842a13
>@@ -83,3 +83,5 @@
> SIZE (leofs/manopapad-proper-f558989_GH0.tar.gz) = 292555
> SHA256 (leofs/ninenines-cowlib-1.0.0_GH0.tar.gz) = 48a8784ae7d266724276f9842b3a06cfbbfe69469f58c27237c602232f7ebe5a
> SIZE (leofs/ninenines-cowlib-1.0.0_GH0.tar.gz) = 41538
>+SHA256 (leofs/systemd-erlang-sd_notify-v1.0_GH0.tar.gz) = f85b731202ad0b9ff351127a44e00c052ec197366c4b96c4e488cd8ad9359eeb
>+SIZE (leofs/systemd-erlang-sd_notify-v1.0_GH0.tar.gz) = 202032
>Index: files/patch-make_reltool.sh
>===================================================================
>--- files/patch-make_reltool.sh	(nonexistent)
>+++ files/patch-make_reltool.sh	(working copy)
>@@ -0,0 +1,8 @@
>+--- make_reltool.sh.orig	2018-04-24 12:31:51.000000000 +0200
>++++ make_reltool.sh	2018-06-11 15:59:25.081369000 +0200
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!/bin/sh
>+ 
>+ # requires first parameter to be either "yes" or "no", which is done by "make reltool"
>+ with_sd_notify=$1
>
>Property changes on: files/patch-make_reltool.sh
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 228887: 194162 | 194169