From nobody Thu Oct 27 19:05:29 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Myw9k1LBBz4gndd; Thu, 27 Oct 2022 19:05:30 +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 4Myw9k13kKz3C24; Thu, 27 Oct 2022 19:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666897530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tW4ipaUB6mCtcUIMPO2QowAttR9qspsNYQkN6RJZnwU=; b=Bk9rL/L3l1cDsnhDnZWgGt/dQkTw9qDfBZoXZi6i63VSrcPO8RbM5CxTmR7V03lX8RRQT/ TY0P/ExaCbGf2KdKsbBOe27mEtxEAze9H0N0xoVMGaf/UwmPVMSQoQLLY0XBdzuGv1uciH eMDA93sc4+e8zThtNlNPJv/aPMXE5WgAsitzCrM0hLlRbyFi3JPYjnUAEEVYU/mxaxpgoB 3V7yCG+byfc43sQhUA511SEPoS2Ixe3wHhgft2BtTrllZESETK1Jx4rhc0LyAMxG8qZNI9 wHHmfJD70VxNdn6KaCe5V+BVHnNCUPnk6q9nxqmvbou8iIjl+EBSOcgoRKqVdw== 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 4Myw9k01Qqz180r; Thu, 27 Oct 2022 19:05:29 +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 29RJ5TMo018520; Thu, 27 Oct 2022 19:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29RJ5Te2018519; Thu, 27 Oct 2022 19:05:29 GMT (envelope-from git) Date: Thu, 27 Oct 2022 19:05:29 GMT Message-Id: <202210271905.29RJ5Te2018519@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 8a784182f66c - main - www/jetty10: New port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a784182f66c3c34f457a636e260042ca15bc95d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666897530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tW4ipaUB6mCtcUIMPO2QowAttR9qspsNYQkN6RJZnwU=; b=Ji/0zYUD5SljEkgdaRQJRl7JI/+WO2OqNx09DyvJFW3x4kATnLVFWcfDfcNi3WfDDyzWdz PP1bKrnMSCUeixLw8EH0JDAL6G0ZqkxvkATbUUOodrmLTGokWHbMGGPPfLcTqcW9bxsNO+ fPqECRA1C1cbo7vs26HTqfVXXc1NvZwVlnKT/NfGIotlVmUn78ClafJGU99L0Y3dqw8nQ4 sOIxLfYXZap53UQV7+w3uD5usFGNLDFV5HfM3zchOub+7o4V7and/grid0OIzrdnPIC89N AFBVbJk2dyxBiDC9JDTcCrqhVUt6NDkOLBwYFqXCwV1mDF2upAYLVSr7mt4Sig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666897530; a=rsa-sha256; cv=none; b=bMf6M/P8bYuGue7TDEGWkuwnG/FsnvNObh+STVuAgnWI6KlMFiarCcHpD7pAV/gXwT8Wve s6GORxllid19bSuU8qRlJXhvbQ/+7h7sWsRNFba3SSwt47g/AIY+NXWmKwOUuPq/FNK9U0 4g4Q+TUGu9aEMJ9H39q1aLOV35th6kRe6MSVhT8KTC7X6tYzeGoBAIKSewQXl9JIv0q79E wpfb5dQf03VXEXz6Us804FjfRQJOtunhYStzV4h8HM7h1P00XvBeTAW9cuBtpfHY3F6QAK +1begQGaO6TREc9/EVmZjOqaY3fTZOK2n6awFyxUObk7cnpOJ6fLedxGhTKXGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a784182f66c3c34f457a636e260042ca15bc95d commit 8a784182f66c3c34f457a636e260042ca15bc95d Author: Ryan Steinmetz AuthorDate: 2022-10-27 19:03:10 +0000 Commit: Ryan Steinmetz CommitDate: 2022-10-27 19:05:09 +0000 www/jetty10: New port The Jetty Web Server provides an HTTP server and Servlet container capable of serving static and dynamic content either from a standalone or embedded instantiations. From jetty-7, the jetty webserver and other core compoments are hosted by the eclipse foundation. The project provides: * Asynchronous HTTP Server * Standard based Servlet Container * Web Sockets server * Asynchronous HTTP Client * OSGi, JNDI, JMX, JASPI, AJP support --- www/Makefile | 1 + www/jetty10/Makefile | 63 +++++ www/jetty10/distinfo | 3 + www/jetty10/files/jetty.in | 39 ++++ www/jetty10/files/jetty.sample.in | 63 +++++ www/jetty10/files/patch-bin_jetty.sh | 11 + www/jetty10/files/patch-etc_webdefault.xml | 11 + www/jetty10/files/pkg-message.in | 53 +++++ www/jetty10/pkg-descr | 12 + www/jetty10/pkg-plist | 357 +++++++++++++++++++++++++++++ 10 files changed, 613 insertions(+) diff --git a/www/Makefile b/www/Makefile index 3564d85b1c74..34b11bd7acd4 100644 --- a/www/Makefile +++ b/www/Makefile @@ -256,6 +256,7 @@ SUBDIR += jesred SUBDIR += jetty8 SUBDIR += jetty9 + SUBDIR += jetty10 SUBDIR += jira-cli SUBDIR += jitsi-meet SUBDIR += jmeter diff --git a/www/jetty10/Makefile b/www/jetty10/Makefile new file mode 100644 index 000000000000..ad734ca5fc06 --- /dev/null +++ b/www/jetty10/Makefile @@ -0,0 +1,63 @@ +PORTNAME= jetty +PORTVERSION= 10.0.12 +CATEGORIES= www java +MASTER_SITES= https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${PORTVERSION}/ +PKGNAMESUFFIX= 10 +DISTNAME= jetty-home-${PORTVERSION} + +MAINTAINER= zi@FreeBSD.org +COMMENT= Full-featured web server implemented entirely in Java +WWW= https://www.eclipse.org/jetty/ + +LICENSE= APACHE20 EPL +LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/license-eplv10-aslv20.html + +RUN_DEPENDS= bash:shells/bash + +USES= cpe shebangfix + +CONFLICTS= jetty8.* jetty9.* + +USE_JAVA= yes +NO_ARCH= yes +CPE_VENDOR= eclipse +SHEBANG_FILES= bin/jetty.sh +NO_BUILD= yes +JAVA_VERSION= 11+ +JAVA_VENDOR= openjdk +USE_RC_SUBR= ${PORTNAME} + +APP_NAME= ${PORTNAME} +APP_HOME= ${PREFIX}/${PORTNAME} + +USERS= www +GROUPS= www + +SUB_LIST= \ + APP_HOME=${APP_HOME} \ + APP_NAME=${APP_NAME} \ + JAVA_HOME=${JAVA_HOME} \ + JAVA=${JAVA} \ + WWWDIR=${WWWDIR} + +SUB_FILES= \ + ${APP_NAME} \ + pkg-message \ + jetty.sample + +PLIST_SUB= \ + APP_HOME=${APP_HOME} \ + APP_NAME=${APP_NAME} \ + WWWDIR=${WWWDIR} \ + PORTVERSION=${PORTVERSION} \ + +do-install: + ${MKDIR} ${STAGEDIR}${APP_HOME} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} + ${RM} ${WRKSRC}/lib/setuid/libsetuid-linux.so ${WRKSRC}/lib/setuid/libsetuid-osx.so + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${PORTNAME}) + ${INSTALL_SCRIPT} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/sbin + + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.sample ${STAGEDIR}${ETCDIR}/ + +.include diff --git a/www/jetty10/distinfo b/www/jetty10/distinfo new file mode 100644 index 000000000000..c194e1d0ca69 --- /dev/null +++ b/www/jetty10/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1666621633 +SHA256 (jetty-home-10.0.12.tar.gz) = b2ae3170a729365e05ba9da057aee5d2654d169912efec73cddc8381ac35d516 +SIZE (jetty-home-10.0.12.tar.gz) = 10955855 diff --git a/www/jetty10/files/jetty.in b/www/jetty10/files/jetty.in new file mode 100644 index 000000000000..64227142de34 --- /dev/null +++ b/www/jetty10/files/jetty.in @@ -0,0 +1,39 @@ +#!/bin/sh + +# PROVIDE: jetty +# REQUIRE: NETWORKING SERVERS +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable %%APP_NAME%%: +# +# %%APP_NAME%%_enable="YES" +# + +. /etc/rc.subr + +name=%%APP_NAME%% +rcvar=%%APP_NAME%%_enable + +command="%%PREFIX%%/sbin/%%APP_NAME%%.sh" +command_args="start" + +# set defaults + +%%APP_NAME%%_enable=${%%APP_NAME%%_enable:-"NO"} +%%APP_NAME%%_user=${%%APP_NAME%%_user:-"www"} +%%APP_NAME%%_group=${%%APP_NAME%%_group:-"www"} + +load_rc_config ${name} + +if test -n "${%%APP_NAME%%_java_version}" ; then + JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2) + procname=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2) +else + JAVA_HOME=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2) + procname=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2) +fi + +export JAVA_HOME + +run_rc_command "$1" diff --git a/www/jetty10/files/jetty.sample.in b/www/jetty10/files/jetty.sample.in new file mode 100644 index 000000000000..58a0eebff808 --- /dev/null +++ b/www/jetty10/files/jetty.sample.in @@ -0,0 +1,63 @@ +# +# Sample Configuration File +# +# JAVA +# Command to invoke Java. If not set, java (from the PATH) will be used. +# + +# JAVA_OPTIONS +# Extra options to pass to the JVM +# + +# JETTY_HOME +# Where Jetty is installed. If not set, the script will try go +# guess it by looking at the invocation path for the script +# The java system property "jetty.home" will be +# set to this value for use by configure.xml files, f.e.: +# +# /webapps/jetty.war +# +JETTY_HOME=%%PREFIX%%/%%APP_NAME%% + +# +# JETTY_BASE +# Where your Jetty base directory is. If not set, the value from +# $JETTY_HOME will be used. +# +# IT IS STRONGLY RECOMMENDED THAT YOU MODIFY THIS VARIABLE TO POINT +# TO THE INSTALLATION OF YOUR WEB APPLICATION, KEEPING YOUR WEB +# APPLICATION SEPARATE FROM THE JETTY HOME LOCATION. +# +# MORE INFORMATION HERE: +# +# http://www.eclipse.org/jetty/documentation/current/startup-base-and-home.html +# +JETTY_BASE=%%WWWDIR%%/demo-base + +# JETTY_RUN +# Where the $NAME.pid file should be stored. It defaults to the +# first available of /var/run, /usr/var/run, JETTY_BASE and /tmp +# if not set. +# + +# JETTY_PID +# The Jetty PID file, defaults to $JETTY_RUN/$NAME.pid +# +JETTY_PID=%%WWWDIR%%/demo-base/%%APP_NAME%%.pid + +# JETTY_ARGS +# The default arguments to pass to jetty. +# For example +# JETTY_ARGS=jetty.http.port=8080 jetty.ssl.port=8443 +# +JETTY_ARGS=jetty.logging.dir=%%WWWDIR%%/demo-base/logs + +# JETTY_USER +# if set, then used as a username to run the server as +# + +# JETTY_SHELL +# If set, then used as the shell by su when starting the server. Will have +# no effect if start-stop-daemon exists. Useful when JETTY_USER does not +# have shell access, e.g. /bin/false +# diff --git a/www/jetty10/files/patch-bin_jetty.sh b/www/jetty10/files/patch-bin_jetty.sh new file mode 100644 index 000000000000..897d33be6586 --- /dev/null +++ b/www/jetty10/files/patch-bin_jetty.sh @@ -0,0 +1,11 @@ +--- bin/jetty.sh.orig 2016-03-19 21:43:53 UTC ++++ bin/jetty.sh +@@ -166,7 +166,7 @@ then + ETC=$HOME/etc + fi + +-for CONFIG in {/etc,~/etc}/default/${NAME}{,9} $HOME/.${NAME}rc; do ++for CONFIG in {/etc,~/etc}/default/${NAME}{,9} $HOME/.${NAME}rc /usr/local/etc/${NAME}/${NAME}{,9}; do + if [ -f "$CONFIG" ] ; then + readConfig "$CONFIG" + fi diff --git a/www/jetty10/files/patch-etc_webdefault.xml b/www/jetty10/files/patch-etc_webdefault.xml new file mode 100644 index 000000000000..26ee1fd623b3 --- /dev/null +++ b/www/jetty10/files/patch-etc_webdefault.xml @@ -0,0 +1,11 @@ +--- etc/webdefault.xml.orig 2022-10-24 21:26:27 UTC ++++ etc/webdefault.xml +@@ -149,7 +149,7 @@ + + + dirAllowed +- true ++ false + + + welcomeServlets diff --git a/www/jetty10/files/pkg-message.in b/www/jetty10/files/pkg-message.in new file mode 100644 index 000000000000..84fb140961b5 --- /dev/null +++ b/www/jetty10/files/pkg-message.in @@ -0,0 +1,53 @@ +[ +{ type: install + message: <