aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando ApesteguĂ­a <fernape@FreeBSD.org>2022-08-15 16:52:45 +0000
committerFernando ApesteguĂ­a <fernape@FreeBSD.org>2022-08-15 17:51:42 +0000
commit6ea017569f39fc9efdfb176254f346736e61c6dc (patch)
tree9c52ddca9e57176916ccd5b2fa6c8e08d0c69d16
parente264b577bb9f84bca0df9209f8caa8c457bca225 (diff)
downloadports-6ea017569f39fc9efdfb176254f346736e61c6dc.tar.gz
ports-6ea017569f39fc9efdfb176254f346736e61c6dc.zip
net/keycloak: Upgrade to 19.0.1
ChangeLog: https://www.keycloak.org/2022/07/keycloak-1901-released PR: 265072 Reported by: yonas.yanfa@gmail.com (maintainer)
-rw-r--r--UPDATING9
-rw-r--r--net/keycloak/Makefile101
-rw-r--r--net/keycloak/distinfo6
-rw-r--r--net/keycloak/files/keycloak.in27
-rw-r--r--net/keycloak/pkg-plist3536
5 files changed, 538 insertions, 3141 deletions
diff --git a/UPDATING b/UPDATING
index d6881fdb6549..45a923bb42f8 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,15 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20220815:
+ AFFECTS: users of net/keycloak
+ AUTHOR: fernape@FreeBSD.org
+
+ The flavors -mysql and -postgres were removed, the necessary configuration
+ for those database backends was rolled into the base release by upstream.
+ The configuration files changed completely, so they need to be rebuilt from
+ scratch.
+
20220807:
AFFECTS: users of news/inn
AUTHOR: kbowling@FreeBSD.org
diff --git a/net/keycloak/Makefile b/net/keycloak/Makefile
index 17eaf7936492..247698e6a850 100644
--- a/net/keycloak/Makefile
+++ b/net/keycloak/Makefile
@@ -1,5 +1,5 @@
PORTNAME= keycloak
-PORTVERSION= 15.1.1
+PORTVERSION= 19.0.1
CATEGORIES= net java
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
@@ -9,38 +9,24 @@ COMMENT= Identity and access management solution
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-FLAVORS= default mysql postgres
-FLAVOR?= ${FLAVORS:[1]}
-mysql_PKGNAMESUFFIX= -mysql
-postgres_PKGNAMESUFFIX= -postgres
-
-.if ${FLAVOR:U} == mysql
-RUN_DEPENDS+= ${JAVAJARDIR}/mysql-connector-java.jar:databases/mysql-connector-java
-PLIST_SUB+= MYSQL=""
-.else
-PLIST_SUB+= MYSQL="@comment "
-.endif
-
-.if ${FLAVOR:U} == postgres
-RUN_DEPENDS+= ${JAVAJARDIR}/postgresql.jar:databases/postgresql-jdbc
-PLIST_SUB+= POSTGRES=""
-.else
-PLIST_SUB+= POSTGRES="@comment "
-.endif
-
-USES= cpe
+RUN_DEPENDS= bash>0:shells/bash
+
+USES= cpe shebangfix
+
CPE_VENDOR= redhat
+SHEBANG_FILES= bin/kc.sh \
+ bin/kcadm.sh \
+ bin/kcreg.sh
+
USE_JAVA= yes
-JAVA_VERSION= 1.8+
+JAVA_VERSION= 11+
JAVA_OS= native
JAVA_VENDOR= openjdk oracle
JAVA_RUN= yes
USE_RC_SUBR= keycloak
-CONFLICTS_INSTALL= keycloak keycloak-mysql keycloak-postgresql # bin/kcadm bin/kcreg
-
USER= www
GROUP= www
@@ -60,82 +46,33 @@ SUB_LIST+= GROUP=${GROUP} \
OPTIONS_DEFINE= DOCS EXAMPLES
-CONFIG_FILES= bin/.jbossclirc \
- bin/add-user.properties \
- bin/domain.conf \
- bin/jboss-cli-logging.properties \
- bin/jboss-cli.xml bin/product.conf \
- bin/standalone.conf \
- domain/configuration/application-roles.properties \
- domain/configuration/application-users.properties \
- domain/configuration/default-server-logging.properties \
- domain/configuration/domain.xml \
- domain/configuration/host-master.xml \
- domain/configuration/host-slave.xml \
- domain/configuration/host.xml \
- domain/configuration/logging.properties \
- domain/configuration/mgmt-groups.properties \
- domain/configuration/mgmt-users.properties \
- modules/layers.conf \
- standalone/configuration/application-roles.properties \
- standalone/configuration/application-users.properties \
- standalone/configuration/logging.properties \
- standalone/configuration/mgmt-groups.properties \
- standalone/configuration/mgmt-users.properties \
- standalone/configuration/standalone-ha.xml \
- standalone/configuration/standalone.xml
+CONFIG_FILES= conf/cache-ispn.xml \
+ conf/keycloak.conf \
+ lib/quarkus/build-system.properties
post-patch:
.for f in ${CONFIG_FILES}
${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}.sample
.endfor
- ${RM} -r ${WRKSRC}/modules/system/layers/base/org/apache/activemq/artemis/journal/main/lib/linux-i686
- ${RM} -r ${WRKSRC}/modules/system/layers/base/org/apache/activemq/artemis/journal/main/lib/linux-x86_64
- ${RM} -r ${WRKSRC}/modules/system/layers/base/org/wildfly/openssl/main/lib
+ ${RM} ${WRKSRC}/bin/kc.bat
+ ${RM} ${WRKSRC}/bin/kcadm.bat
+ ${RM} ${WRKSRC}/bin/kcreg.bat
do-install:
${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/bin
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- ${MKDIR} ${STAGEDIR}${LOG_DIR}/domain
- ${MKDIR} ${STAGEDIR}${LOG_DIR}/standalone
+ ${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/data
+ ${MKDIR} ${STAGEDIR}${LOG_DIR}
${MKDIR} ${STAGEDIR}${RUN_DIR}
# Install files in bin
${INSTALL_SCRIPT} ${WRKSRC}/bin/*.sh ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/bin
-.for f in .jbossclirc.sample add-user.properties.sample domain.conf.sample jboss-cli-logging.properties.sample jboss-cli.xml.sample \
- launcher.jar migrate-domain-clustered.cli migrate-domain-standalone.cli migrate-standalone-ha.cli migrate-standalone.cli \
- product.conf.sample standalone.conf.sample wildfly-elytron-tool.jar
- ${INSTALL_DATA} ${WRKSRC}/bin/${f} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/bin
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/jboss-modules.jar ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
(cd ${WRKSRC}/bin && ${COPYTREE_SHARE} client ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/bin)
# Install jar files, configuration and everything else
- (cd ${WRKSRC} && ${COPYTREE_SHARE} "domain modules standalone themes welcome-content" ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME})
- (cd ${WRKSRC}/docs/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.for d in licenses-keycloak schema
- (cd ${WRKSRC}/docs/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${d})
-.endfor
+ (cd ${WRKSRC} && ${COPYTREE_SHARE} "conf lib providers themes" ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME})
# Create links for kc* binaries
${LN} -sf ../share/java/${PORTNAME}/bin/kcadm.sh ${STAGEDIR}${PREFIX}/bin/kcadm
${LN} -sf ../share/java/${PORTNAME}/bin/kcreg.sh ${STAGEDIR}${PREFIX}/bin/kcreg
- # Create links for log directories
- ${LN} -sf ../../../../../..${LOG_DIR}/domain ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/domain/log
- ${LN} -sf ../../../../../..${LOG_DIR}/standalone ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/standalone/log
-
-.if ${FLAVOR:U} == mysql
- @${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/modules/system/layers/keycloak/com/mysql/main
- ${CP} ${FILESDIR}/mysql-module.xml ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/modules/system/layers/keycloak/com/mysql/main/module.xml
- ${LN} -sf ${JAVAJARDIR}/mysql-connector-java.jar ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/modules/system/layers/keycloak/com/mysql/main/mysql-connector-java.jar
-.endif
-
-.if ${FLAVOR:U} == postgres
- @${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/modules/system/layers/keycloak/org/postgresql/main
- ${CP} ${FILESDIR}/postgresql-module.xml ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/modules/system/layers/keycloak/org/postgresql/main/module.xml
- ${LN} -sf ${JAVAJARDIR}/postgresql.jar ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/modules/system/layers/keycloak/org/postgresql/main/postgresql.jar
-.endif
-
.include <bsd.port.mk>
diff --git a/net/keycloak/distinfo b/net/keycloak/distinfo
index 4965e7be36e4..8d71838d9653 100644
--- a/net/keycloak/distinfo
+++ b/net/keycloak/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639736757
-SHA256 (keycloak-15.1.1.tar.gz) = 44fbe5f5d1dda87ff0292f238220c23df6fda4ba234ffafe8102c646e74043f0
-SIZE (keycloak-15.1.1.tar.gz) = 263053207
+TIMESTAMP = 1660553913
+SHA256 (keycloak-19.0.1.tar.gz) = b1e9f89a6d02b9bf43848a970c69d94fb7e75c75fc8ebe2f69a1b7d2e0739733
+SIZE (keycloak-19.0.1.tar.gz) = 171578620
diff --git a/net/keycloak/files/keycloak.in b/net/keycloak/files/keycloak.in
index 15d935e77718..ad88f6699df3 100644
--- a/net/keycloak/files/keycloak.in
+++ b/net/keycloak/files/keycloak.in
@@ -1,5 +1,7 @@
#!/bin/sh
+# $FreeBSD$
+#
# PROVIDE: %%PORTNAME%%
# REQUIRE: NETWORKING SERVERS
# KEYWORD: shutdown
@@ -9,10 +11,6 @@
#
# %%PORTNAME%%_enable (bool): Set it to YES to enable keycloak on startup.
# Default: NO
-# %%PORTNAME%%_host_config (string): Choose the host config if running in domain mode (host-master, host-slave).
-# Default: host-master
-# %%PORTNAME%%_mode (string): Choose the desired operating mode (standalone, standalone-ha, domain).
-# Default: standalone
# %%PORTNAME%%_user (string): User account to run with.
# Default: www
# %%PORTNAME%%_flags (string): Additional flags for the startup script.
@@ -27,8 +25,6 @@ desc="Identity and access management solution"
load_rc_config $name
: ${%%PORTNAME%%_enable:=NO}
-: ${%%PORTNAME%%_host_config:="host-master"}
-: ${%%PORTNAME%%_mode:=standalone}
: ${%%PORTNAME%%_user:=%%USER%%}
: ${%%PORTNAME%%_group:=%%GROUP%%}
: ${%%PORTNAME%%_flags:=""}
@@ -42,18 +38,6 @@ stop_cmd="%%PORTNAME%%_stop"
%%PORTNAME%%_start()
{
- local %%PORTNAME%%_startscript
-
- if [ ${%%PORTNAME%%_mode} = "domain" ]; then
- %%PORTNAME%%_flags="--host-config=${%%PORTNAME%%_host_config} ${%%PORTNAME%%_flags}"
- %%PORTNAME%%_startscript=domain.sh
- elif [ ${%%PORTNAME%%_mode} = "standalone-ha" ]; then
- %%PORTNAME%%_flags="--server-config=standalone-ha.xml ${%%PORTNAME%%_flags}"
- %%PORTNAME%%_startscript=standalone.sh
- else
- %%PORTNAME%%_startscript=standalone.sh
- fi
-
if [ ! -d "%%LOG_DIR%%" ]; then
install -d -o ${%%PORTNAME%%_user} %%LOG_DIR%%
fi
@@ -62,12 +46,10 @@ stop_cmd="%%PORTNAME%%_stop"
fi
chown -R ${%%PORTNAME%%_user} %%LOG_DIR%%
- chown -R ${%%PORTNAME%%_user} %%JAVASHAREDIR%%/%%PORTNAME%%/domain
- chown -R ${%%PORTNAME%%_user} %%JAVASHAREDIR%%/%%PORTNAME%%/standalone
echo "Starting %%PORTNAME%%."
${command} ${command_args} \
- %%JAVASHAREDIR%%/%%PORTNAME%%/bin/${%%PORTNAME%%_startscript} \
+ %%JAVASHAREDIR%%/%%PORTNAME%%/bin/kc.sh start \
${%%PORTNAME%%_flags}
}
@@ -83,8 +65,7 @@ stop_cmd="%%PORTNAME%%_stop"
kill -TERM ${pid_daemon}
fi
-
- pid_child=$(pgrep -U ${%%PORTNAME%%_user} -f %%JAVASHAREDIR%%/%%PORTNAME%%/jboss-modules.jar)
+ pid_child=$(pgrep -U ${%%PORTNAME%%_user} -f %%JAVASHAREDIR%%/%%PORTNAME%%/)
if [ ! -z "${pid_child}" ]; then
kill -TERM ${pid_child}
fi
diff --git a/net/keycloak/pkg-plist b/net/keycloak/pkg-plist
index 3476d02375f4..3f4fb5fed689 100644
--- a/net/keycloak/pkg-plist
+++ b/net/keycloak/pkg-plist
@@ -1,3040 +1,510 @@
bin/kcadm
bin/kcreg
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/@emotion,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/@patternfly,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/@pika-react-dom,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/@pika-react,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/Ace Code Editor,BSD 3-clause New or Revised License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/Angular Treeview,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/AngularJS,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/FileSaver.js,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/Font Awesome (Font),SIL Open Font License 1.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/Glyphicons Halflings,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/OpenSans,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/Patternfly,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/RCUE,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/Select2,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/Select2,GNU General Public License v2.0 only.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/UI.Ace,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/Zocial,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/angular-file-upload,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/angular-translate,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/angular-ui-bootstrap,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/attr-accept,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/change-case,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/com.fasterxml.jackson.dataformat,jackson-dataformat-cbor,2.12.1,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/com.github.ua-parser,uap-java,1.4.3,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/com.google.zxing,core,3.4.0,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/com.google.zxing,javase,3.4.0,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/com.googlecode.owasp-java-html-sanitizer,owasp-java-html-sanitizer,20191001.1,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/com.openshift,openshift-restclient-java,8.0.0.Final,Eclipse Public License 1.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/com.webauthn4j,webauthnj4-core,0.12.0.RELEASE,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/com.webauthn4j,webauthnj4-util,0.12.0.RELEASE,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/commons-lang,commons-lang,2.6,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/commons-lang,commons-lang3,3-3.11,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/file-selector,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/focus-trap,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/history,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/hoist-non-react-statics,BSD-3-Clause.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/invariant,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/isarray,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/jQuery,MIT License.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/licenses.css
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/licenses.html
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/licenses.xml
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/licenses.xsl
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/object-assign,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.apache.kerby,kerby-asn1,2.0.0,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.apache.maven,maven-core,3.3.9,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.apache.maven,maven-plugin-api,3.3.9,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.freemarker,freemarker,2.3.31,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.infinispan,infinispan-jboss-marshalling,11.0.9.Final,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.jboss.marshalling,jboss-marshalling-river,2.0.11.Final,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.jboss.marshalling,jboss-marshalling,2.0.11.Final,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.keycloak,keycloak-server-feature-pack-dependencies,15.1.1,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.liquibase,liquibase-core,3.5.5,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.twitter4j,twitter4j-core,4.0.7,Apache Software License 2.0.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/path-to-regexp,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/popper.js,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/prop-types,MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/licenses-keyclo