From nobody Thu Jul 04 18:18:50 2024 X-Original-To: dev-commits-ports-all@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 4WFPzZ27jKz5P6Hq; Thu, 04 Jul 2024 18:18:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WFPzZ1bHWz43kW; Thu, 4 Jul 2024 18:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720117130; 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=7ljLDvoCR03Ifjjhv6lTDbWGyMe9WdBvrMo3LYUA9hQ=; b=ulQnEXC/SJ2GxgWIVO6IKWBglRW46n9KOHS0zbCGyaFj2HCjjJEVgb4zV3TZ+SHBDu4D0j pebRFs5c6ngmO0mhsgl8YpuXtxybAyZUknkzcPlnY1nWpjxjXpmTC1i1XqLendtIn/ypX7 t51fPecoNlbJs9lTkQFYikh5azo+/HnWzCzrphwTcxvJYvfXbfaNnHoThekM4a5p6LO+yj GTCIUW1e+Orrv3EHy6Uktbwv60B+Eu8/q1p6CObaIjd7y//wTu2IctEx9LsEd8jkAXaf0X tfbn3HT5hBV/PQ8xztHlBypBWM95olyiyhe+N4Q6wfu/e8OL2dYbXF0dhHAHdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720117130; a=rsa-sha256; cv=none; b=S7qfSCyIEnsWEyfcWXpSqIsfpaAHbWZ5XtfnHSVzfWL91F0b6UcXQ+mc9h5/HtdDIzl+kV PN2S/tw9Fj2dhgtU9OS7TOR9lcLx43cMQDCeT2qj2Me1/N/a2ooDAlWwpk8BhHUwgvYGCk 9HYqfiClLm3G2EF0PCcDBqFFQCx9rngp8dMUeTRekssGQFBW/6nZo0xih+T3P2vJ/W/fat dilsesTgqdgUpRHddr544Z12/szGa4qqJrp9k5arwcYPZ6z+TihXuTMB4wayZb9QmASr/P DclTJehSkPZe3Oc5Q258CbUJIYYJ/X0m38dJ9guYrlBGhDnXOhoLNscWBk3wQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720117130; 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=7ljLDvoCR03Ifjjhv6lTDbWGyMe9WdBvrMo3LYUA9hQ=; b=yrTCSfnrPmhvsYETMp1Ch5Q8lZjW+W3oiA8UiPJEJPbOUUMoh5BhlsS2kHRkvi9K4T2HMV 6qJVhIGXFivJHu53mb2UQNFE/6ahC2aEb2uuJ8B5sgNQw9bmFMEmfh1GAwFpSS5GNktyNB clpfMhKsBBPh4GCaBvs3y6OesRR6NJVgd5I7EP1wXuSTiXDPo9ivSbCRKspxGsDwKCaXU2 XCYinMFnRlrw55CRJeZFnvXHYUr8TDfBSf+ntZrywGoqYHpep0TnQ0SWtZ5ZOkLYjDlaun iawWxIL/tSFDrlJzpos6MUUMTTo/FwDkTd6bbPKAHVMjLsq0qr2suvMkTni66g== 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 4WFPzZ13xdzPFt; Thu, 4 Jul 2024 18:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 464IIoEE070991; Thu, 4 Jul 2024 18:18:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 464IIod3070987; Thu, 4 Jul 2024 18:18:50 GMT (envelope-from git) Date: Thu, 4 Jul 2024 18:18:50 GMT Message-Id: <202407041818.464IIod3070987@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: defe5b76402c - main - www/jetty12: New port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: defe5b76402c0c1d36345c13d0067d6dcbaf40f1 Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=defe5b76402c0c1d36345c13d0067d6dcbaf40f1 commit defe5b76402c0c1d36345c13d0067d6dcbaf40f1 Author: Ryan Steinmetz AuthorDate: 2024-07-04 18:18:22 +0000 Commit: Ryan Steinmetz CommitDate: 2024-07-04 18:18:22 +0000 www/jetty12: New port Eclipse Jetty provides a highly scalable and memory-efficient web server and servlet container, supporting many protocols such as HTTP/3,2,1 and WebSocket. Furthermore, the project offers integrations with many other technologies, such as: * Asynchronous HTTP Server * Standard based Servlet Container * Web Sockets server * Asynchronous HTTP Client * OSGi, JNDI, JMX, JASPI, AJP support --- www/Makefile | 1 + www/jetty12/Makefile | 63 +++ www/jetty12/distinfo | 3 + www/jetty12/files/jetty.in | 39 ++ www/jetty12/files/jetty.sample.in | 63 +++ www/jetty12/files/patch-bin_jetty.sh | 11 + www/jetty12/files/patch-etc_webdefault-ee10.xml | 11 + www/jetty12/files/patch-etc_webdefault-ee8.xml | 11 + www/jetty12/files/patch-etc_webdefault-ee9.xml | 11 + www/jetty12/files/pkg-message.in | 53 +++ www/jetty12/pkg-descr | 11 + www/jetty12/pkg-plist | 575 ++++++++++++++++++++++++ 12 files changed, 852 insertions(+) diff --git a/www/Makefile b/www/Makefile index f3963253736f..62750f6b48b6 100644 --- a/www/Makefile +++ b/www/Makefile @@ -270,6 +270,7 @@ SUBDIR += jericho-html SUBDIR += jesred SUBDIR += jetty10 + SUBDIR += jetty12 SUBDIR += jira-cli SUBDIR += jitsi-meet SUBDIR += jmeter diff --git a/www/jetty12/Makefile b/www/jetty12/Makefile new file mode 100644 index 000000000000..db1dd40238b8 --- /dev/null +++ b/www/jetty12/Makefile @@ -0,0 +1,63 @@ +PORTNAME= jetty +PORTVERSION= 12.0.10 +CATEGORIES= www java +MASTER_SITES= https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${PORTVERSION}/ +PKGNAMESUFFIX= 12 +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.txt + +RUN_DEPENDS= bash:shells/bash + +USES= cpe shebangfix + +CONFLICTS= jetty8.* jetty9.* jetty10.* jetty11.* + +USE_JAVA= yes +NO_ARCH= yes +CPE_VENDOR= eclipse +SHEBANG_FILES= bin/jetty.sh +NO_BUILD= yes +JAVA_VERSION= 17+ +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/jetty12/distinfo b/www/jetty12/distinfo new file mode 100644 index 000000000000..5510849f9976 --- /dev/null +++ b/www/jetty12/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1720103889 +SHA256 (jetty-home-12.0.10.tar.gz) = 3dc3378159fef48320c699d99c845958df852e5015f60b0e8917aa2cc4809dcd +SIZE (jetty-home-12.0.10.tar.gz) = 34368742 diff --git a/www/jetty12/files/jetty.in b/www/jetty12/files/jetty.in new file mode 100644 index 000000000000..64227142de34 --- /dev/null +++ b/www/jetty12/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/jetty12/files/jetty.sample.in b/www/jetty12/files/jetty.sample.in new file mode 100644 index 000000000000..58a0eebff808 --- /dev/null +++ b/www/jetty12/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/jetty12/files/patch-bin_jetty.sh b/www/jetty12/files/patch-bin_jetty.sh new file mode 100644 index 000000000000..af6e9a704610 --- /dev/null +++ b/www/jetty12/files/patch-bin_jetty.sh @@ -0,0 +1,11 @@ +--- bin/jetty.sh.orig 2024-07-04 15:09:33 UTC ++++ bin/jetty.sh +@@ -313,7 +313,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/jetty12/files/patch-etc_webdefault-ee10.xml b/www/jetty12/files/patch-etc_webdefault-ee10.xml new file mode 100644 index 000000000000..60e58a07a3e7 --- /dev/null +++ b/www/jetty12/files/patch-etc_webdefault-ee10.xml @@ -0,0 +1,11 @@ +--- etc/webdefault-ee10.xml.orig 2024-07-04 15:13:21 UTC ++++ etc/webdefault-ee10.xml +@@ -139,7 +139,7 @@ + + + dirAllowed +- true ++ false + + + welcomeServlets diff --git a/www/jetty12/files/patch-etc_webdefault-ee8.xml b/www/jetty12/files/patch-etc_webdefault-ee8.xml new file mode 100644 index 000000000000..e216191771ce --- /dev/null +++ b/www/jetty12/files/patch-etc_webdefault-ee8.xml @@ -0,0 +1,11 @@ +--- etc/webdefault-ee8.xml.orig 2024-07-04 15:12:08 UTC ++++ etc/webdefault-ee8.xml +@@ -141,7 +141,7 @@ + + + dirAllowed +- true ++ false + + + welcomeServlets diff --git a/www/jetty12/files/patch-etc_webdefault-ee9.xml b/www/jetty12/files/patch-etc_webdefault-ee9.xml new file mode 100644 index 000000000000..cbf9555f04a2 --- /dev/null +++ b/www/jetty12/files/patch-etc_webdefault-ee9.xml @@ -0,0 +1,11 @@ +--- etc/webdefault-ee9.xml.orig 2024-07-04 15:13:21 UTC ++++ etc/webdefault-ee9.xml +@@ -141,7 +141,7 @@ + + + dirAllowed +- true ++ false + + + welcomeServlets diff --git a/www/jetty12/files/pkg-message.in b/www/jetty12/files/pkg-message.in new file mode 100644 index 000000000000..84fb140961b5 --- /dev/null +++ b/www/jetty12/files/pkg-message.in @@ -0,0 +1,53 @@ +[ +{ type: install + message: <