Date: Tue, 4 Jan 2022 10:40:20 GMT From: Alexander Leidinger <netchild@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1a85399f1636 - main - security/bastillion: update to 3.12.02 Message-ID: <202201041040.204AeK5e031519@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a85399f16362dd0d288311a688d8cca49a8bc93 commit 1a85399f16362dd0d288311a688d8cca49a8bc93 Author: Alexander Leidinger <netchild@FreeBSD.org> AuthorDate: 2022-01-04 10:35:05 +0000 Commit: Alexander Leidinger <netchild@FreeBSD.org> CommitDate: 2022-01-04 10:37:47 +0000 security/bastillion: update to 3.12.02 Release notes at https://github.com/bastillion-io/Bastillion/releases/tag/v3.12.02 --- security/bastillion/Makefile | 6 +- security/bastillion/distinfo | 10 +-- security/bastillion/files/pkg-message.in | 8 +- security/bastillion/pkg-plist | 143 +++++++++++++++---------------- 4 files changed, 81 insertions(+), 86 deletions(-) diff --git a/security/bastillion/Makefile b/security/bastillion/Makefile index 8be20720b61d..a1f00997ff34 100644 --- a/security/bastillion/Makefile +++ b/security/bastillion/Makefile @@ -2,9 +2,9 @@ PORTNAME= bastillion DISTVERSIONPREFIX= jetty-v -DISTVERSION= 3.12_00 +DISTVERSION= 3.12_02 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${PORTNAME}-upgrade-3.08.00.jar + ${PORTNAME}-upgrade-4.00.00.jar PORTREVISION= 0 CATEGORIES= security www java MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/ @@ -74,7 +74,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/start.ini ${STAGEDIR}${PREFIX}/${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${PREFIX}/${WWWDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.sample ${STAGEDIR}${ETCDIR}/ - ${INSTALL_DATA} ${DISTDIR}/bastillion-upgrade-3.08.00.jar ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade/ + ${INSTALL_DATA} ${DISTDIR}/bastillion-upgrade-4.00.00.jar ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade/ gen-plist: ${ECHO} '@sample %%ETCDIR%%/%%APP_NAME%%.sample' >${PLIST}.new diff --git a/security/bastillion/distinfo b/security/bastillion/distinfo index d14e00567684..8515cbc44cbc 100644 --- a/security/bastillion/distinfo +++ b/security/bastillion/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1640073876 -SHA256 (bastillion-jetty-v3.12_00.tar.gz) = 312084367414a18ab9febb3d2e338a8cce2849dfb9e28709831febf2f30e0bb0 -SIZE (bastillion-jetty-v3.12_00.tar.gz) = 20364656 -SHA256 (bastillion-upgrade-3.08.00.jar) = 8d18adc90d258b9a9de5e5865c9f632c563d0557ad9458b9f1082ede15ed074b -SIZE (bastillion-upgrade-3.08.00.jar) = 3557485 +TIMESTAMP = 1641290175 +SHA256 (bastillion-jetty-v3.12_02.tar.gz) = d71d5cf779bc9d1e3b9d7ac6b5c6b871d7e4891248890bde0c2336ef36ad979e +SIZE (bastillion-jetty-v3.12_02.tar.gz) = 20531616 +SHA256 (bastillion-upgrade-4.00.00.jar) = 63d5e04d685e7d3ffb2956136e603dc7348d67f2e2160bdf3beb87f5099b1a4b +SIZE (bastillion-upgrade-4.00.00.jar) = 4490992 diff --git a/security/bastillion/files/pkg-message.in b/security/bastillion/files/pkg-message.in index 59c81da651e0..9a85fd59d5a7 100644 --- a/security/bastillion/files/pkg-message.in +++ b/security/bastillion/files/pkg-message.in @@ -18,11 +18,11 @@ EOT } { type: upgrade - maximum_version: "3.08.00" + maximum_version: "3.12.02" message: <<EOT -The datastore of bastillion needs to be upgraded (if you do not see users / can not login -as someone else than admin, you forgot to upgrade it): - java -jar %%PREFIX%%/jetty_bastillion/upgrade/bastillion-upgrade-3.08.00.jar %%PREFIX%%/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties +The datastore of bastillion needs to be upgraded (if you do not see users / can not login, +you forgot to upgrade it): + java -jar %%PREFIX%%/jetty_bastillion/upgrade/bastillion-upgrade-4.00.00.jar %%PREFIX%%/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties EOT } { diff --git a/security/bastillion/pkg-plist b/security/bastillion/pkg-plist index 5fd21603516a..0265438bd595 100644 --- a/security/bastillion/pkg-plist +++ b/security/bastillion/pkg-plist @@ -85,16 +85,15 @@ jetty_bastillion/bastillion/WEB-INF/lib/commons-logging-1.2.jar jetty_bastillion/bastillion/WEB-INF/lib/commons-pool2-2.10.0.jar jetty_bastillion/bastillion/WEB-INF/lib/core-3.4.1.jar jetty_bastillion/bastillion/WEB-INF/lib/gson-2.8.9.jar -jetty_bastillion/bastillion/WEB-INF/lib/h2-2.0.202.jar +jetty_bastillion/bastillion/WEB-INF/lib/h2-2.0.204.jar jetty_bastillion/bastillion/WEB-INF/lib/javassist-3.20.0-GA.jar -jetty_bastillion/bastillion/WEB-INF/lib/jsch-0.1.71.jar +jetty_bastillion/bastillion/WEB-INF/lib/jsch-0.1.72.jar jetty_bastillion/bastillion/WEB-INF/lib/lmvc-1.09.00.jar -jetty_bastillion/bastillion/WEB-INF/lib/log4j-api-2.16.0.jar -jetty_bastillion/bastillion/WEB-INF/lib/log4j-core-2.16.0.jar -jetty_bastillion/bastillion/WEB-INF/lib/log4j-slf4j-impl-2.16.0.jar +jetty_bastillion/bastillion/WEB-INF/lib/log4j-api-2.17.0.jar +jetty_bastillion/bastillion/WEB-INF/lib/log4j-core-2.17.0.jar +jetty_bastillion/bastillion/WEB-INF/lib/log4j-slf4j-impl-2.17.0.jar jetty_bastillion/bastillion/WEB-INF/lib/ognl-3.1.26.jar -jetty_bastillion/bastillion/WEB-INF/lib/slf4j-api-1.8.0-beta4.jar -jetty_bastillion/bastillion/WEB-INF/lib/slf4j-jdk14-1.8.0-beta4.jar +jetty_bastillion/bastillion/WEB-INF/lib/slf4j-api-1.7.32.jar jetty_bastillion/bastillion/WEB-INF/lib/thymeleaf-3.0.14.RELEASE.jar jetty_bastillion/bastillion/WEB-INF/lib/unbescape-1.1.6.RELEASE.jar jetty_bastillion/bastillion/WEB-INF/web.xml @@ -208,89 +207,83 @@ jetty_bastillion/bastillion/manage/view_terms.html jetty_bastillion/bastillion/manage/view_users.html jetty_bastillion/bin/jetty.service jetty_bastillion/bin/jetty.sh -jetty_bastillion/lib/annotations/asm-7.3.1.jar -jetty_bastillion/lib/annotations/asm-analysis-7.3.1.jar -jetty_bastillion/lib/annotations/asm-commons-7.3.1.jar -jetty_bastillion/lib/annotations/asm-tree-7.3.1.jar -jetty_bastillion/lib/annotations/javax.annotation-api-1.3.jar +jetty_bastillion/lib/annotations/asm-9.2.jar +jetty_bastillion/lib/annotations/asm-analysis-9.2.jar +jetty_bastillion/lib/annotations/asm-commons-9.2.jar +jetty_bastillion/lib/annotations/asm-tree-9.2.jar +jetty_bastillion/lib/annotations/javax.annotation-api-1.3.2.jar jetty_bastillion/lib/apache-jsp/org.eclipse.jdt.ecj-3.19.0.jar -jetty_bastillion/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.4.29.v20200521.jar -jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-el-8.5.49.jar -jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.5.49.jar +jetty_bastillion/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.4.44.v20210927.jar +jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-el-8.5.70.jar +jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.5.70.jar jetty_bastillion/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar jetty_bastillion/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar jetty_bastillion/lib/ext/.donotdelete -jetty_bastillion/lib/fcgi/fcgi-client-9.4.29.v20200521.jar -jetty_bastillion/lib/fcgi/fcgi-server-9.4.29.v20200521.jar -jetty_bastillion/lib/http2/http2-common-9.4.29.v20200521.jar -jetty_bastillion/lib/http2/http2-hpack-9.4.29.v20200521.jar -jetty_bastillion/lib/http2/http2-server-9.4.29.v20200521.jar -jetty_bastillion/lib/infinispan-common-9.4.29.v20200521.jar -jetty_bastillion/lib/infinispan-embedded-query-9.4.29.v20200521.jar -jetty_bastillion/lib/infinispan-remote-query-9.4.29.v20200521.jar +jetty_bastillion/lib/fcgi/fcgi-client-9.4.44.v20210927.jar +jetty_bastillion/lib/fcgi/fcgi-server-9.4.44.v20210927.jar +jetty_bastillion/lib/http2/http2-common-9.4.44.v20210927.jar +jetty_bastillion/lib/http2/http2-hpack-9.4.44.v20210927.jar +jetty_bastillion/lib/http2/http2-server-9.4.44.v20210927.jar +jetty_bastillion/lib/infinispan-common-9.4.44.v20210927.jar +jetty_bastillion/lib/infinispan-embedded-query-9.4.44.v20210927.jar +jetty_bastillion/lib/infinispan-remote-query-9.4.44.v20210927.jar jetty_bastillion/lib/jaspi/javax.security.auth.message-1.0.0.v201108011116.jar -jetty_bastillion/lib/jetty-alpn-conscrypt-server-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-alpn-java-server-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-alpn-openjdk8-server-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-alpn-server-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-annotations-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-cdi-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-client-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-continuation-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-deploy-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-gcloud-session-manager-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-hazelcast-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-http-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-io-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-jaas-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-jaspi-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-jmx-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-jndi-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-memcached-sessions-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-nosql-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-openid-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-plus-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-proxy-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-quickstart-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-rewrite-9.4.29.v20200521.jar +jetty_bastillion/lib/jetty-alpn-conscrypt-server-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-alpn-java-server-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-alpn-openjdk8-server-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-alpn-server-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-annotations-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-cdi-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-client-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-continuation-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-deploy-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-gcloud-session-manager-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-hazelcast-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-http-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-io-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-jaas-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-jaspi-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-jmx-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-jndi-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-memcached-sessions-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-nosql-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-openid-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-plus-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-proxy-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-quickstart-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-rewrite-9.4.44.v20210927.jar jetty_bastillion/lib/jetty-schemas-3.1.jar -jetty_bastillion/lib/jetty-security-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-server-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-servlet-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-servlets-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-unixsocket-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-util-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-util-ajax-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-webapp-9.4.29.v20200521.jar -jetty_bastillion/lib/jetty-xml-9.4.29.v20200521.jar +jetty_bastillion/lib/jetty-security-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-server-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-servlet-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-servlets-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-unixsocket-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-util-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-util-ajax-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-webapp-9.4.44.v20210927.jar +jetty_bastillion/lib/jetty-xml-9.4.44.v20210927.jar jetty_bastillion/lib/mail/javax.mail.glassfish-1.4.1.v201005082020.jar jetty_bastillion/lib/servlet-api-3.1.jar jetty_bastillion/lib/setuid/jetty-setuid-java-1.0.4.jar jetty_bastillion/lib/setuid/libsetuid-linux.so jetty_bastillion/lib/setuid/libsetuid-osx.so -jetty_bastillion/lib/spring/jetty-spring-9.4.29.v20200521.jar +jetty_bastillion/lib/spring/jetty-spring-9.4.44.v20210927.jar jetty_bastillion/lib/transactions/javax.transaction-api-1.3.jar -jetty_bastillion/lib/websocket/javax-websocket-client-impl-9.4.29.v20200521.jar -jetty_bastillion/lib/websocket/javax-websocket-server-impl-9.4.29.v20200521.jar +jetty_bastillion/lib/websocket/javax-websocket-client-impl-9.4.44.v20210927.jar +jetty_bastillion/lib/websocket/javax-websocket-server-impl-9.4.44.v20210927.jar jetty_bastillion/lib/websocket/javax.websocket-api-1.0.jar -jetty_bastillion/lib/websocket/websocket-api-9.4.29.v20200521.jar -jetty_bastillion/lib/websocket/websocket-client-9.4.29.v20200521.jar -jetty_bastillion/lib/websocket/websocket-common-9.4.29.v20200521.jar -jetty_bastillion/lib/websocket/websocket-server-9.4.29.v20200521.jar -jetty_bastillion/lib/websocket/websocket-servlet-9.4.29.v20200521.jar +jetty_bastillion/lib/websocket/websocket-api-9.4.44.v20210927.jar +jetty_bastillion/lib/websocket/websocket-client-9.4.44.v20210927.jar +jetty_bastillion/lib/websocket/websocket-common-9.4.44.v20210927.jar +jetty_bastillion/lib/websocket/websocket-server-9.4.44.v20210927.jar +jetty_bastillion/lib/websocket/websocket-servlet-9.4.44.v20210927.jar jetty_bastillion/license-eplv10-aslv20.html jetty_bastillion/logs/.donotdelete jetty_bastillion/modules/.donotdelete jetty_bastillion/modules/acceptratelimit.mod -jetty_bastillion/modules/alpn-impl.mod -jetty_bastillion/modules/alpn-impl/alpn-10.mod -jetty_bastillion/modules/alpn-impl/alpn-11.mod -jetty_bastillion/modules/alpn-impl/alpn-12.mod -jetty_bastillion/modules/alpn-impl/alpn-13.mod -jetty_bastillion/modules/alpn-impl/alpn-14.mod -jetty_bastillion/modules/alpn-impl/alpn-15.mod -jetty_bastillion/modules/alpn-impl/alpn-8.mod -jetty_bastillion/modules/alpn-impl/alpn-9.mod +jetty_bastillion/modules/alpn-impl/alpn-16.mod +jetty_bastillion/modules/alpn-impl/alpn-available-false.mod +jetty_bastillion/modules/alpn-impl/alpn-available-true.mod jetty_bastillion/modules/alpn.mod jetty_bastillion/modules/annotations.mod jetty_bastillion/modules/apache-jsp.mod @@ -429,6 +422,7 @@ jetty_bastillion/modules/slf4j-logback.mod jetty_bastillion/modules/slf4j-simple-impl.mod jetty_bastillion/modules/slf4j-simple-impl/resources/simplelogger.properties jetty_bastillion/modules/spring.mod +jetty_bastillion/modules/ssl-reload.mod jetty_bastillion/modules/ssl.mod jetty_bastillion/modules/ssl/keystore jetty_bastillion/modules/stats.mod @@ -446,7 +440,7 @@ jetty_bastillion/modules/webapp.mod jetty_bastillion/modules/websocket.mod jetty_bastillion/notice.html jetty_bastillion/start.jar -jetty_bastillion/upgrade/bastillion-upgrade-3.08.00.jar +jetty_bastillion/upgrade/bastillion-upgrade-4.00.00.jar @dir(www,www,755) jetty_bastillion/bastillion/WEB-INF/classes @dir(www,www,755) %%WWWDIR%% @dir(www,www,755) %%WWWDIR%%/work @@ -495,6 +489,7 @@ jetty_bastillion/upgrade/bastillion-upgrade-3.08.00.jar %%WWWDIR%%/etc/jetty-rewrite.xml %%WWWDIR%%/etc/jetty-setuid.xml %%WWWDIR%%/etc/jetty-spring.xml +%%WWWDIR%%/etc/jetty-ssl-context-reload.xml %%WWWDIR%%/etc/jetty-ssl-context.xml %%WWWDIR%%/etc/jetty-ssl.xml %%WWWDIR%%/etc/jetty-started.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201041040.204AeK5e031519>