Date: Mon, 4 Oct 2021 20:05:01 GMT From: Dave Cottlehuber <dch@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 35fa1752677e - main - sysutils/stanchion: remove Message-ID: <202110042005.194K5112018754@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=35fa1752677e53dc8a10a9be14d08c34a967ae6f commit 35fa1752677e53dc8a10a9be14d08c34a967ae6f Author: Dave Cottlehuber <dch@FreeBSD.org> AuthorDate: 2021-10-04 09:05:55 +0000 Commit: Dave Cottlehuber <dch@FreeBSD.org> CommitDate: 2021-10-04 20:04:17 +0000 sysutils/stanchion: remove - requires unsupported erlang version - requires removed sysutils/riak-cs ports Approved by: wg (maintainer) --- sysutils/Makefile | 1 - sysutils/stanchion/Makefile | 77 ------------------------ sysutils/stanchion/distinfo | 2 - sysutils/stanchion/files/patch-rel_vars.config | 43 ------------- sysutils/stanchion/files/stanchion.in | 83 -------------------------- sysutils/stanchion/pkg-descr | 5 -- sysutils/stanchion/pkg-plist | 13 ---- 7 files changed, 224 deletions(-) diff --git a/sysutils/Makefile b/sysutils/Makefile index 311c12395da2..1265c07d472d 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1308,7 +1308,6 @@ SUBDIR += sshsudo SUBDIR += ssync SUBDIR += stalepid - SUBDIR += stanchion SUBDIR += stepsync SUBDIR += storcli SUBDIR += stow diff --git a/sysutils/stanchion/Makefile b/sysutils/stanchion/Makefile deleted file mode 100644 index 20492f1c0468..000000000000 --- a/sysutils/stanchion/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -PORTNAME= stanchion -PORTVERSION= 2.1.0 -PORTREVISION= 2 -CATEGORIES= sysutils -MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/stanchion/${PORTVERSION:R}/${PORTVERSION}/ \ - http://downloads.basho.com.s3.amazonaws.com/stanchion/${PORTVERSION:R}/${PORTVERSION}/ - -MAINTAINER= wg@FreeBSD.org -COMMENT= Open source database cluster control for Riak - -LICENSE= APACHE20 - -BUILD_DEPENDS= ${LOCALBASE}/lib/riak-erlang/bin/erlc:lang/erlang-riak - -USES= gmake readline -USE_RC_SUBR= stanchion - -USERS= stanchion -GROUPS= riak - -STANCHION_CONFDIR?= ${PREFIX}/etc/stanchion -STANCHION_DBDIR?= /var/db/stanchion -STANCHION_HOMEDIR?= ${PREFIX}/lib/stanchion -STANCHION_LIBDIR?= ${PREFIX}/lib/stanchion/lib -STANCHION_LOGDIR?= /var/log/stanchion - -PLIST_SUB+= STANCHION_CONFDIR=${STANCHION_CONFDIR} \ - STANCHION_DBDIR=${STANCHION_DBDIR} \ - STANCHION_HOMEDIR=${STANCHION_HOMEDIR} \ - STANCHION_LIBDIR=${STANCHION_LIBDIR} \ - STANCHION_LOGDIR=${STANCHION_LOGDIR} \ - USERS=${USERS} \ - GROUPS=${GROUPS} - -ALL_TARGET= rel -MAKE_JOBS_UNSAFE=yes -MAKE_ENV= PATH=${LOCALBASE}/lib/riak-erlang/bin:${PATH} - -post-patch: - @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config - -do-install: - ${MKDIR} ${STAGEDIR}${STANCHION_CONFDIR} - ${MKDIR} ${STAGEDIR}${STANCHION_DBDIR} - ${MKDIR} ${STAGEDIR}${STANCHION_LOGDIR} - ${INSTALL_DATA} ${WRKSRC}/rel/stanchion/etc/stanchion.conf ${STAGEDIR}${STANCHION_CONFDIR}/stanchion.conf - ${INSTALL_DATA} ${WRKSRC}/rel/stanchion/etc/advanced.config ${STAGEDIR}${STANCHION_CONFDIR}/advanced.config - ${INSTALL_DATA} ${WRKSRC}/rel/stanchion/etc/cert.pem ${STAGEDIR}${STANCHION_CONFDIR}/cert.pem - ${INSTALL_DATA} ${WRKSRC}/rel/stanchion/etc/key.pem ${STAGEDIR}${STANCHION_CONFDIR}/key.pem - (cd ${WRKSRC}/rel/stanchion/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${STANCHION_LIBDIR}) - (cd ${WRKSRC}/rel/stanchion/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/) - (cd ${WRKSRC}/rel/stanchion/releases && ${COPYTREE_SHARE} . ${STAGEDIR}${STANCHION_HOMEDIR}/releases) - ${CP} -R ${WRKSRC}/rel/stanchion/erts-* ${STAGEDIR}${STANCHION_HOMEDIR} - -post-install: - (cd ${STAGEDIR}${STANCHION_HOMEDIR}; ${FIND} releases -type f \ - | ${SED} -e 's,^\./,,g' \ - | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ - | ${AWK} '{print "lib/stanchion/"$$2 }' >> ${TMPPLIST}) - (cd ${STAGEDIR}${STANCHION_HOMEDIR}; ${FIND} erts-* -type f \ - | ${SED} -e 's,^\./,,g' \ - | ${AWK} '{print length, $$0}' | ${SORT} -rn \ - | ${AWK} '{print "lib/stanchion/"$$2 }' >> ${TMPPLIST}) - (cd ${STAGEDIR}${STANCHION_HOMEDIR}; ${FIND} erts-* -type d -empty \ - | ${SED} -e 's,^\./,,g' \ - | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ - | ${AWK} '{print "@dir lib/stanchion/"$$2 }' >> ${TMPPLIST}) - (cd ${STAGEDIR}${STANCHION_LIBDIR}; ${FIND} . -type f \ - | ${SED} -e 's,^\./,,g' \ - | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ - | ${AWK} '{print "lib/stanchion/lib/"$$2 }' >> ${TMPPLIST}) - (cd ${STAGEDIR}${STANCHION_LIBDIR}; ${FIND} . -type d -empty \ - | ${SED} -e 's,^\./,,g' \ - | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ - | ${AWK} '{print "@dir lib/stanchion/lib/"$$2 }' >> ${TMPPLIST}) - -.include <bsd.port.mk> diff --git a/sysutils/stanchion/distinfo b/sysutils/stanchion/distinfo deleted file mode 100644 index 3435beeed97e..000000000000 --- a/sysutils/stanchion/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (stanchion-2.1.0.tar.gz) = bb10d7b726dde6940f686e4fa55adcef3e507d5e31a5746353f477e4fbc4df2b -SIZE (stanchion-2.1.0.tar.gz) = 5567264 diff --git a/sysutils/stanchion/files/patch-rel_vars.config b/sysutils/stanchion/files/patch-rel_vars.config deleted file mode 100644 index bd80ec46e5c1..000000000000 --- a/sysutils/stanchion/files/patch-rel_vars.config +++ /dev/null @@ -1,43 +0,0 @@ ---- rel/vars.config.orig 2015-03-23 18:52:47.000000000 +1100 -+++ rel/vars.config 2015-09-24 15:04:54.707161521 +1000 -@@ -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/stanchion"}. -+{platform_bin_dir, "%%PREFIX%%/sbin"}. -+{platform_etc_dir, "%%PREFIX%%/etc/stanchion"}. -+{platform_lib_dir, "%%PREFIX%%/lib/stanchion/lib"}. -+{platform_data_dir, "/var/db/stanchion"}. -+{platform_log_dir, "/var/log/stanchion"}. - - %% - %% etc/app.config -@@ -29,14 +30,14 @@ - %% bin/stanchion - %% - {data_dir, "{{target_dir}}/data"}. --{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/stanchion"}. -+{runner_user, "stanchion"}. - {runner_wait_process, "stanchion_server_sup"}. - - %% lager diff --git a/sysutils/stanchion/files/stanchion.in b/sysutils/stanchion/files/stanchion.in deleted file mode 100644 index 8165b0f0880e..000000000000 --- a/sysutils/stanchion/files/stanchion.in +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -# PROVIDE: stanchion -# REQUIRE: LOGIN cleanvar -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable stanchion: -# stanchion_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable stanchion on boot. -# - -. /etc/rc.subr - -name="stanchion" -rcvar=stanchion_enable - -pidfile=/var/run/stanchion/stanchion.pid - -start_cmd="stanchion_start" -stop_cmd="stanchion_stop" -restart_cdm="stanchion_restart" -status_cmd="stanchion_status" -command="%%PREFIX%%/sbin/stanchion" - -load_rc_config $name - -# Read rc.d config and set defaults -load_rc_config "$name" -: ${stanchion_enable="NO"} - -stanchion_start() -{ - echo "Starting Riak." - %%PREFIX%%/sbin/stanchion start - return 0 -} - -stanchion_stop() -{ - echo "Stopping Riak processes" - %%PREFIX%%/sbin/stanchion stop - killall -9 epmd - return 0 -} - -stanchion_restart() -{ - stanchion_stop - stanchion_start - return 0 -} - -stanchion_status() -{ - if stanchion_running; then - echo "Riak is running." - return 0 - else - echo "Riak is not running" - return 1 - fi -} - -stanchion_running() -{ - local pid result ps - pid=`%%PREFIX%%/sbin/stanchion getpid` - result=`echo $?` - if [ "$result" == 0 ]; then - ps=`ps -waux | grep ${pid} | grep stanchion` - result=`echo $?` - if [ "$result" ]; then - return 0 - else - return 1 - fi - else - return 1 - fi -} - -run_rc_command "$1" diff --git a/sysutils/stanchion/pkg-descr b/sysutils/stanchion/pkg-descr deleted file mode 100644 index 84aa5a3af30d..000000000000 --- a/sysutils/stanchion/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Stanchion is an application to enforce the serialization of requests. It -consists of two main parts: a simple HTTP interface and a processing backend -that manages requests and interacts with a local Riak instance. - -WWW: https://github.com/basho/stanchion diff --git a/sysutils/stanchion/pkg-plist b/sysutils/stanchion/pkg-plist deleted file mode 100644 index 1f04bd203bb8..000000000000 --- a/sysutils/stanchion/pkg-plist +++ /dev/null @@ -1,13 +0,0 @@ -sbin/stanchion -sbin/stanchion-admin -@sample %%STANCHION_CONFDIR%%/stanchion.conf -@sample %%STANCHION_CONFDIR%%/advanced.config -@sample %%STANCHION_CONFDIR%%/key.pem -@sample %%STANCHION_CONFDIR%%/cert.pem -@dir %%STANCHION_CONFDIR%% -@owner %%USERS%% -@group %%GROUPS%% -@dir %%STANCHION_DBDIR%% -@dir %%STANCHION_HOMEDIR%% -@dir %%STANCHION_LIBDIR%% -@dir %%STANCHION_LOGDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110042005.194K5112018754>