sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

security/bastillion: update to 3.13.00

Browse source 
Contains updates to h2 and log4j.
This commit is contained in:
Alexander Leidinger 2022-01-10 11:51:41 +01:00
parent f0dd69ce62
commit c527917cbb
4 changed files with 16 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
security/bastillion/Makefile
View file

@ -2,9 +2,9 @@
PORTNAME= bastillion PORTNAME= bastillion
DISTVERSIONPREFIX= jetty-v DISTVERSIONPREFIX= jetty-v
DISTVERSION= 3.12_02 DISTVERSION= 3.13_00
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-upgrade-4.00.00.jar ${PORTNAME}-upgrade-4.00.01.jar
PORTREVISION= 0 PORTREVISION= 0
CATEGORIES= security www java CATEGORIES= security www java
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/ 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}/start.ini ${STAGEDIR}${PREFIX}/${WWWDIR}
${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${PREFIX}/${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${PREFIX}/${WWWDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.sample ${STAGEDIR}${ETCDIR}/ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.sample ${STAGEDIR}${ETCDIR}/
${INSTALL_DATA} ${DISTDIR}/bastillion-upgrade-4.00.00.jar ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade/ ${INSTALL_DATA} ${DISTDIR}/bastillion-upgrade-4.00.01.jar ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade/
gen-plist: gen-plist:
${ECHO} '@sample %%ETCDIR%%/%%APP_NAME%%.sample' >${PLIST}.new ${ECHO} '@sample %%ETCDIR%%/%%APP_NAME%%.sample' >${PLIST}.new

10
security/bastillion/distinfo
View file

@ -1,5 +1,5 @@
TIMESTAMP = 1641290175 TIMESTAMP = 1641810868
SHA256 (bastillion-jetty-v3.12_02.tar.gz) = d71d5cf779bc9d1e3b9d7ac6b5c6b871d7e4891248890bde0c2336ef36ad979e SHA256 (bastillion-jetty-v3.13_00.tar.gz) = 5d4d668c1f30e1ea90234d962c4d6cfed1c581ff5c417aeca627c5ff7bee3931
SIZE (bastillion-jetty-v3.12_02.tar.gz) = 20531616 SIZE (bastillion-jetty-v3.13_00.tar.gz) = 20514662
SHA256 (bastillion-upgrade-4.00.00.jar) = 63d5e04d685e7d3ffb2956136e603dc7348d67f2e2160bdf3beb87f5099b1a4b SHA256 (bastillion-upgrade-4.00.01.jar) = 1960bf8ba7a27314be1e3dfcd03fd9a97d43883a39a335e018db6606c6b84e49
SIZE (bastillion-upgrade-4.00.00.jar) = 4490992 SIZE (bastillion-upgrade-4.00.01.jar) = 4493492

16
security/bastillion/files/pkg-message.in
View file

@ -18,23 +18,11 @@ EOT
} }
{ {
type: upgrade type: upgrade
maximum_version: "3.12.02" minimum_version: "3.10.00"
message: <<EOT message: <<EOT
The datastore of bastillion needs to be upgraded (if you do not see users / can not login, The datastore of bastillion needs to be upgraded (if you do not see users / can not login,
you forgot to upgrade it): 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 java -jar %%PREFIX%%/jetty_bastillion/upgrade/bastillion-upgrade-4.00.01.jar %%PREFIX%%/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties
EOT
}
{
type: upgrade
maximum_version: "3.12.00"
message: <<EOT
The update to 3.12.00 contains an incompatible DB change. Either recreate your
DB (rm %%PREFIX%%/jetty_bastillion/bastillion/WEB-INF/classes/keydb/bastillion.*
and restart) by hand, or export the old DB while the old version is
installed and import the data into a new DB. See
https://github.com/bastillion-io/Bastillion/issues/405
for details.
EOT EOT
} }
] ]

12
security/bastillion/pkg-plist
View file

@ -85,13 +85,13 @@ 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/commons-pool2-2.10.0.jar
jetty_bastillion/bastillion/WEB-INF/lib/core-3.4.1.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/gson-2.8.9.jar
jetty_bastillion/bastillion/WEB-INF/lib/h2-2.0.204.jar jetty_bastillion/bastillion/WEB-INF/lib/h2-2.0.206.jar
jetty_bastillion/bastillion/WEB-INF/lib/javassist-3.20.0-GA.jar jetty_bastillion/bastillion/WEB-INF/lib/javassist-3.20.0-GA.jar
jetty_bastillion/bastillion/WEB-INF/lib/jsch-0.1.72.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/lmvc-1.09.01.jar
jetty_bastillion/bastillion/WEB-INF/lib/log4j-api-2.17.0.jar jetty_bastillion/bastillion/WEB-INF/lib/log4j-api-2.17.1.jar
jetty_bastillion/bastillion/WEB-INF/lib/log4j-core-2.17.0.jar jetty_bastillion/bastillion/WEB-INF/lib/log4j-core-2.17.1.jar
jetty_bastillion/bastillion/WEB-INF/lib/log4j-slf4j-impl-2.17.0.jar jetty_bastillion/bastillion/WEB-INF/lib/log4j-slf4j-impl-2.17.1.jar
jetty_bastillion/bastillion/WEB-INF/lib/ognl-3.1.26.jar jetty_bastillion/bastillion/WEB-INF/lib/ognl-3.1.26.jar
jetty_bastillion/bastillion/WEB-INF/lib/slf4j-api-1.7.32.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/thymeleaf-3.0.14.RELEASE.jar
@ -440,7 +440,7 @@ jetty_bastillion/modules/webapp.mod
jetty_bastillion/modules/websocket.mod jetty_bastillion/modules/websocket.mod
jetty_bastillion/notice.html jetty_bastillion/notice.html
jetty_bastillion/start.jar jetty_bastillion/start.jar
jetty_bastillion/upgrade/bastillion-upgrade-4.00.00.jar jetty_bastillion/upgrade/bastillion-upgrade-4.00.01.jar
@dir(www,www,755) jetty_bastillion/bastillion/WEB-INF/classes @dir(www,www,755) jetty_bastillion/bastillion/WEB-INF/classes
@dir(www,www,755) %%WWWDIR%% @dir(www,www,755) %%WWWDIR%%
@dir(www,www,755) %%WWWDIR%%/work @dir(www,www,755) %%WWWDIR%%/work