From owner-dev-commits-ports-main@freebsd.org Wed Apr 7 21:20:34 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 44C0B5C53C3; Wed, 7 Apr 2021 21:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFy3k1Rv9z4pMD; Wed, 7 Apr 2021 21:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 24263260D3; Wed, 7 Apr 2021 21:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 137LKYU2084386; Wed, 7 Apr 2021 21:20:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 137LKYnp084385; Wed, 7 Apr 2021 21:20:34 GMT (envelope-from git) Date: Wed, 7 Apr 2021 21:20:34 GMT Message-Id: <202104072120.137LKYnp084385@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: e9c46eff6764 - main - databases/couchdb2: not supported upstream, use databases/couchdb3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9c46eff6764e30d0cf5ee2ba407940b58a4a592 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 21:20:34 -0000 The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9c46eff6764e30d0cf5ee2ba407940b58a4a592 commit e9c46eff6764e30d0cf5ee2ba407940b58a4a592 Author: Dave Cottlehuber AuthorDate: 2021-04-07 20:43:43 +0000 Commit: Dave Cottlehuber CommitDate: 2021-04-07 21:19:14 +0000 databases/couchdb2: not supported upstream, use databases/couchdb3 Apache CouchDB v2 requires spidermonkey185 and python2.7 which are both EOL --- MOVED | 2 + databases/Makefile | 1 - databases/couchdb2/Makefile | 105 --- databases/couchdb2/distinfo | 3 - databases/couchdb2/files/couchdb2.in | 93 --- databases/couchdb2/files/patch-configure | 26 - .../couchdb2/files/patch-rel_overlay_etc_vm.args | 14 - databases/couchdb2/files/patch-rel_reltool.config | 10 - ...patch-src_ibrowse_src_ibrowse__http__client.erl | 11 - databases/couchdb2/files/pkg-message.in | 37 - databases/couchdb2/pkg-descr | 6 - databases/couchdb2/pkg-plist | 822 --------------------- 12 files changed, 2 insertions(+), 1128 deletions(-) diff --git a/MOVED b/MOVED index e1ba81c8e434..2dc8f9a0132d 100644 --- a/MOVED +++ b/MOVED @@ -16273,3 +16273,5 @@ devel/buildtool||2021-04-07|Has expired: Unmaintained and dead upstream, does no misc/floatator||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) finance/wmstock||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) ftp/frox||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11) +databases/couchdb2|databases/couchdb3|2021-04-07|No longer supported upstream, uses spidermonkey68 & python2; move to databases/couchdb3 + diff --git a/databases/Makefile b/databases/Makefile index 70c1db36c8e7..89fa0c284e2c 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -38,7 +38,6 @@ SUBDIR += cegobridge SUBDIR += clickhouse SUBDIR += cockroach - SUBDIR += couchdb2 SUBDIR += couchdb3 SUBDIR += courier-authlib-mysql SUBDIR += courier-authlib-pgsql diff --git a/databases/couchdb2/Makefile b/databases/couchdb2/Makefile deleted file mode 100644 index a2c1025624f5..000000000000 --- a/databases/couchdb2/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -# Created by: Dave Cottlehuber - -PORTNAME= couchdb2 -DISTVERSION= 2.3.1 -PORTREVISION= 7 -CATEGORIES= databases -MASTER_SITES= APACHE/couchdb/source/${DISTVERSION} -DISTNAME= apache-couchdb-${DISTVERSION} - -MAINTAINER= dch@FreeBSD.org -COMMENT= JSON document database with HTTP API and scalable multi-master sync - -LICENSE= APACHE20 BSD3CLAUSE ISCL WTFPL OFL11 -LICENSE_COMB= multi - -DEPRECATED= Uses EOL Python 2.7 via lang/spidermonkey185 -EXPIRATION_DATE=2021-06-23 - -BUILD_DEPENDS= rebar:devel/rebar \ - erlang-runtime21>=21.3:lang/erlang-runtime21 -LIB_DEPENDS= libicudata.so:devel/icu \ - libmozjs185.so:lang/spidermonkey185 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ - erlang-runtime21>=21.3:lang/erlang-runtime21 - -USES= cpe gmake libtool ncurses python:run shebangfix -USE_RC_SUBR= couchdb2 - -CPE_VENDOR= apache -SHEBANG_FILES= rel/overlay/bin/couchup - -USERS= couchdb -GROUPS= couchdb - -SUB_FILES= pkg-message -SUB_LIST= APPDIR=${APPDIR} \ - ERL_PATH=${LOCALBASE}/lib/erlang21/bin/erl \ - PORTNAME=${PORTNAME} \ - RELDIR=${RELDIR} -PLIST_SUB= VERSION=${DISTVERSION} - -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --skip-deps --user ${USERS} --disable-docs --disable-fauxton - -ALL_TARGET= release - -MAKE_ENV= PATH=${LOCALBASE}/lib/erlang21/bin:${PATH} - -OPTIONS_DEFINE= DOCS -OPTIONS_SUB= yes - -DBDIR?= /var/db/${PORTNAME} -LOGFILE?= /var/log/${PORTNAME}/couch.log -APPDIR= ${LOCALBASE}/libexec/${PORTNAME} -RELDIR= ${APPDIR}/releases/${DISTVERSION} - -post-patch: - @${REINPLACE_CMD} \ - -e 's,%%APPDIR%%,${APPDIR},g' \ - -e 's,%%DATADIR%%,${DATADIR},g' \ - -e 's,%%DBDIR%%,${DBDIR},g' \ - -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ - -e 's,%%PORTNAME%%,${PORTNAME},g' \ - -e 's,%%WWWDIR%%,${WWWDIR},g' \ - -e 's,$$COUCHDB_USER,${USERS},g' \ - -e 's,$$LOG_FILE,${LOGFILE},g' \ - ${WRKSRC}/configure - -pre-install: - # relocate user-modifiable runtime configs to match hier(7) - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/local.ini \ - ${STAGEDIR}${ETCDIR}/local.ini.sample - ${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/vm.args \ - ${STAGEDIR}${ETCDIR}/vm.args.sample - ${INSTALL_MAN} ${WRKSRC}/share/docs/man/apachecouchdb.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1 - # prune build artefacts and surplus headers - @${FIND} -E ${WRKSRC} -type f \ - -regex '.*\.(a|buildinfo|c|cc|cmd|d|h|o|orig|1)' -delete - # remove runtime dirs and files that were moved to match hier(7) - @${RM} -r ${WRKSRC}/rel/couchdb/var \ - ${WRKSRC}/rel/couchdb/etc/*.d \ - ${WRKSRC}/rel/couchdb/etc/local.ini \ - ${WRKSRC}/rel/couchdb/etc/vm.args \ - ${WRKSRC}/rel/couchdb/releases/*/vm.args \ - ${WRKSRC}/rel/couchdb/lib/couch-*/priv/couchjs \ - ${WRKSRC}/share/server - @${CP} ${WRKSRC}/src/docs/images/favicon.ico ${WRKSRC}/share/www/ - (cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${APPDIR}) - -post-install: - @${FIND} -E ${STAGEDIR} -type f \ - \( -name couchjs -o -name *.so \) \ - -exec ${STRIP_CMD} {} + - @${MKDIR} \ - ${STAGEDIR}/var/db/${PORTNAME} \ - ${STAGEDIR}/var/log/${PORTNAME} - # fauxton UI is a required component - (cd ${WRKSRC}/share/www && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) - -post-install-DOCS-on: - (cd ${WRKSRC}/share/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/docs) - -.include diff --git a/databases/couchdb2/distinfo b/databases/couchdb2/distinfo deleted file mode 100644 index 6dc098a0c8a1..000000000000 --- a/databases/couchdb2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1551956133 -SHA256 (apache-couchdb-2.3.1.tar.gz) = 43eb8cec41eb52871bf22d35f3e2c2ce5b806ebdbce3594cf6b0438f2534227d -SIZE (apache-couchdb-2.3.1.tar.gz) = 13473795 diff --git a/databases/couchdb2/files/couchdb2.in b/databases/couchdb2/files/couchdb2.in deleted file mode 100644 index f7137fdd1d66..000000000000 --- a/databases/couchdb2/files/couchdb2.in +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -# PROVIDE: couchdb2 -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# couchdb2_enable (bool): Set to NO by default. -# Set it to YES to enable couchdb2. - -. /etc/rc.subr - -name="couchdb2" -rcvar=couchdb2_enable - -start_cmd="${name}_start" -stop_cmd="${name}_stop" -status_cmd="${name}_status" - -load_rc_config $name - -: ${couchdb2_enable:="NO"} -: ${couchdb2_user="couchdb"} -: ${couchdb2_erl_flags="-couch_ini %%APPDIR%%/etc/default.ini %%ETCDIR%%/local.ini"} -: ${couchdb2_chdir="/var/db/%%PORTNAME%%"} - -command="%%ERL_PATH%%" -pidfile="/var/run/${name}.pid" -daemonpidfile="/var/run/${name}-daemon.pid" - -erl_sasl='-sasl releases_dir \"%%PORTNAME%%/releases\"' -erl_boot='-boot %%RELDIR%%/couchdb -boot_var RELTOOL_EXT_LIB %%APPDIR%%/lib' -erl_args='-args_file %%ETCDIR%%/vm.args' -erl_flags="${erl_sasl} ${erl_boot} ${erl_args} ${couchdb2_erl_flags}" - -couchdb2_start() -{ - # chdir manually as overriding _start() blocks rc.subr defaults - cd "${couchdb2_chdir}" - /usr/sbin/daemon -p ${pidfile} \ - -P ${daemonpidfile} \ - -t ${name} \ - -u ${couchdb2_user} \ - env ERL_FLAGS="${erl_flags}" \ - HOME=/var/run/couchdb2 \ - ERL_CRASH_DUMP=/var/run/couchdb2/erl_crash.dump \ - COUCHDB_QUERY_SERVER_JAVASCRIPT="%%APPDIR%%/bin/couchjs %%APPDIR%%/share/server/main.js" \ - COUCHDB_QUERY_SERVER_COFFEESCRIPT="%%APPDIR%%/bin/couchjs %%APPDIR%%/share/server/main-coffee.js" \ - ${command} -} - -couchdb2_stop() -{ - echo -n "Stopping ${name}: " - retval=0 - if ! status_quiet - then - echo "already stopped" - return 1 - else - couchdb2_pids=$(/bin/pgrep -ifU ${couchdb2_user} ${name}) - kill ${couchdb2_pids} - wait_for_pids ${couchdb2_pids} - retval=$? - echo "stopped" - fi - return $retval -} - -couchdb2_status() -{ - /bin/pgrep -ifU ${couchdb2_user} ${name} > /dev/null && status="$?" || status="$?" - if [ "${status}" = 0 ]; then - echo "${name} is running" - return 0 - elif [ "${status}" = 4 ]; then - echo "could not access PID file for ${name}" - return ${status} - else - echo "${name} is not running" - return ${status} - fi -} - -status_quiet() -{ - couchdb2_status >/dev/null 2>&1 -} - -run_rc_command $1 - diff --git a/databases/couchdb2/files/patch-configure b/databases/couchdb2/files/patch-configure deleted file mode 100644 index 8895c7beadb2..000000000000 --- a/databases/couchdb2/files/patch-configure +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.orig 2018-08-18 17:55:47 UTC -+++ configure -@@ -19,7 +19,7 @@ - rootdir="$(cd "${0%/*}" 2>/dev/null; echo "$PWD")" - basename=`basename $0` - --PACKAGE_AUTHOR_NAME="The Apache Software Foundation" -+PACKAGE_AUTHOR_NAME="FreeBSD" - - # TEST=0 - WITH_CURL="false" -@@ -168,10 +168,10 @@ cat > rel/couchdb.config << EOF - % - {package_author_name, "$PACKAGE_AUTHOR_NAME"}. --{prefix, "."}. -+{prefix, "%%APPDIR%%"}. --{data_dir, "./data"}. --{view_index_dir, "./data"}. -+{data_dir, "%%DBDIR%%"}. -+{view_index_dir, "%%DBDIR%%"}. - {log_file, "$LOG_FILE"}. --{fauxton_root, "./share/www"}. -+{fauxton_root, "%%WWWDIR%%"}. - {user, "$COUCHDB_USER"}. - {node_name, "-name couchdb@127.0.0.1"}. - {cluster_port, 5984}. diff --git a/databases/couchdb2/files/patch-rel_overlay_etc_vm.args b/databases/couchdb2/files/patch-rel_overlay_etc_vm.args deleted file mode 100644 index e0181bad9d9b..000000000000 --- a/databases/couchdb2/files/patch-rel_overlay_etc_vm.args +++ /dev/null @@ -1,14 +0,0 @@ ---- rel/overlay/etc/vm.args.orig 2018-12-19 09:30:35 UTC -+++ rel/overlay/etc/vm.args -@@ -43,9 +43,9 @@ - # Start a pool of asynchronous IO threads - +A 16 - --# Comment this line out to enable the interactive Erlang shell on startup -+# Comment these lines out to enable the interactive Erlang shell on startup - +Bd -noinput -- -+-detached - # Force use of the smp scheduler, fixes #1296 - -smp enable - diff --git a/databases/couchdb2/files/patch-rel_reltool.config b/databases/couchdb2/files/patch-rel_reltool.config deleted file mode 100644 index 7593f3e40460..000000000000 --- a/databases/couchdb2/files/patch-rel_reltool.config +++ /dev/null @@ -1,10 +0,0 @@ ---- rel/reltool.config.orig 2018-08-20 14:11:32 UTC -+++ rel/reltool.config -@@ -11,6 +11,7 @@ - % the License. - - {sys, [ -+ {excl_lib, otp_root}, %% require erts runtime from FreeBSD ports - {lib_dirs, ["../src"]}, - {rel, "couchdb", "2.2.0", [ - %% stdlib diff --git a/databases/couchdb2/files/patch-src_ibrowse_src_ibrowse__http__client.erl b/databases/couchdb2/files/patch-src_ibrowse_src_ibrowse__http__client.erl deleted file mode 100644 index bfc1f0d78488..000000000000 --- a/databases/couchdb2/files/patch-src_ibrowse_src_ibrowse__http__client.erl +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ibrowse/src/ibrowse_http_client.erl.orig 2018-09-19 11:50:56 UTC -+++ src/ibrowse/src/ibrowse_http_client.erl -@@ -532,7 +532,7 @@ is_ipv6_host(Host) -> - {ok, {_, _, _, _}} -> - false; - _ -> -- case inet:gethostbyname(Host) of -+ case inet:gethostbyname(Host, inet6) of - {ok, #hostent{h_addrtype = inet6}} -> - true; - _ -> diff --git a/databases/couchdb2/files/pkg-message.in b/databases/couchdb2/files/pkg-message.in deleted file mode 100644 index 910baa937bbb..000000000000 --- a/databases/couchdb2/files/pkg-message.in +++ /dev/null @@ -1,37 +0,0 @@ -[ -{ type: install - message: <