diff --git a/sysutils/openvox-server8/Makefile b/sysutils/openvox-server8/Makefile index 0a73a2834c9f..02be5a045910 100644 --- a/sysutils/openvox-server8/Makefile +++ b/sysutils/openvox-server8/Makefile @@ -1,95 +1,90 @@ PORTNAME= openvox-server -PORTVERSION= 8.8.1 +PORTVERSION= 8.11.0 CATEGORIES= sysutils java MASTER_SITES= https://artifacts.voxpupuli.org/${PORTNAME}/${PORTVERSION}/ PKGNAMESUFFIX= 8 MAINTAINER= puppet@FreeBSD.org COMMENT= Puppet Server running in the JVM WWW= https://docs.puppetlabs.com/puppetserver/latest/services_master_puppetserver.html LICENSE= APACHE20 ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON=Bundled JNI only support some architectures RUN_DEPENDS= bash>=0:shells/bash \ openvox-agent8>=8.0:sysutils/openvox-agent8 \ rubygem-openvoxserver-ca>=1:sysutils/rubygem-openvoxserver-ca \ rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \ sudo>=1:security/sudo USES= ruby java shebangfix JAVA_VERSION= 11+ USE_RC_SUBR= puppetserver WRKSRC= ${WRKDIR}/puppetserver-${PORTVERSION} NO_ARCH= yes NO_BUILD= yes CONFLICTS_INSTALL= openvox-server[0-9] puppetserver[0-9] SHEBANG_FILES= ext/bin/puppetserver USERS= puppet GROUPS= puppet DATADIR= ${PREFIX}/share/puppetserver ETCDIR= ${PREFIX}/etc/puppetserver SUB_LIST= JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message post-patch: .for file in ext/config/logback.xml ext/config/request-logging.xml \ ext/config/conf.d/global.conf ext/config/conf.d/puppetserver.conf \ ext/config/conf.d/web-routes.conf ext/config/conf.d/webserver.conf \ ext/config/conf.d/auth.conf ext/config/services.d/ca.cfg \ ext/system-config/services.d/bootstrap.cfg ext/bin/puppetserver \ ext/cli_defaults/cli-defaults.sh ext/cli/foreground @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ -e 's|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|' \ -e 's|%%RUBY_VER%%|${RUBY_VER}|' \ -e 's|%%JAVA%%|${JAVA}|' \ -e 's|%%ETCDIR%%|${ETCDIR}|' \ -e 's|%%DATADIR%%|${DATADIR}|' \ ${WRKSRC}/${file} .endfor @${REINPLACE_CMD} -e 's|#!/opt/puppetlabs/puppet/bin/ruby|#!${RUBY}|' \ - ${WRKSRC}/ext/cli/ca \ - ${WRKSRC}/ext/cli/dropsonde + ${WRKSRC}/ext/cli/ca do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d @${MKDIR} ${STAGEDIR}${ETCDIR}/services.d @${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code @${MKDIR} ${STAGEDIR}/var/log/puppetserver @${MKDIR} ${STAGEDIR}/var/puppet/server @${MKDIR} ${STAGEDIR}/var/puppet/server/data @${MKDIR} ${STAGEDIR}/var/puppetserver @${MKDIR} ${STAGEDIR}/var/run/puppetserver ${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample ${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample ${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml.sample ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf.sample ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf.sample ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf.sample ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf.sample ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/metrics.conf ${STAGEDIR}${ETCDIR}/conf.d/metrics.conf.sample ${INSTALL_DATA} ${WRKSRC}/ext/config/services.d/ca.cfg ${STAGEDIR}${ETCDIR}/services.d/ca.cfg.sample ${INSTALL_DATA} ${WRKSRC}/ext/system-config/services.d/bootstrap.cfg ${STAGEDIR}${ETCDIR}/services.d/bootstrap.cfg.sample ${INSTALL_DATA} ${WRKSRC}/ext/bin/puppetserver ${STAGEDIR}${PREFIX}/bin/puppetserver - ${INSTALL_DATA} ${WRKSRC}/ext/ezbake-functions.sh ${STAGEDIR}${DATADIR}/ezbake-functions.sh ${INSTALL_DATA} ${WRKSRC}/ext/cli/ca ${STAGEDIR}${DATADIR}/cli/apps/ca ${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground ${INSTALL_DATA} ${WRKSRC}/ext/cli/gem ${STAGEDIR}${DATADIR}/cli/apps/gem ${INSTALL_DATA} ${WRKSRC}/ext/cli/irb ${STAGEDIR}${DATADIR}/cli/apps/irb - ${INSTALL_DATA} ${WRKSRC}/ext/cli/reload ${STAGEDIR}${DATADIR}/cli/apps/reload ${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby - ${INSTALL_DATA} ${WRKSRC}/ext/cli/start ${STAGEDIR}${DATADIR}/cli/apps/start - ${INSTALL_DATA} ${WRKSRC}/ext/cli/stop ${STAGEDIR}${DATADIR}/cli/apps/stop ${INSTALL_DATA} ${WRKSRC}/ext/cli_defaults/cli-defaults.sh ${STAGEDIR}${DATADIR}/cli/cli-defaults.sh .include diff --git a/sysutils/openvox-server8/distinfo b/sysutils/openvox-server8/distinfo index bd8ba86be44a..e8b2c167af36 100644 --- a/sysutils/openvox-server8/distinfo +++ b/sysutils/openvox-server8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1748051578 -SHA256 (openvox-server-8.8.1.tar.gz) = de3314abf1aadea3d304e65992e586a6895ec9998dacf17ab099acbb0f1ca8e2 -SIZE (openvox-server-8.8.1.tar.gz) = 64708317 +TIMESTAMP = 1756944029 +SHA256 (openvox-server-8.11.0.tar.gz) = d0a51e1295f0a7bf10a0afc974ceae195b97614322bd854ad1cb234a3cb9495a +SIZE (openvox-server-8.11.0.tar.gz) = 64613554 diff --git a/sysutils/openvox-server8/files/patch-ext__cli__foreground b/sysutils/openvox-server8/files/patch-ext__cli__foreground index a4a4a5ad6649..ff89df8a0c4a 100644 --- a/sysutils/openvox-server8/files/patch-ext__cli__foreground +++ b/sysutils/openvox-server8/files/patch-ext__cli__foreground @@ -1,19 +1,19 @@ ---- ext/cli/foreground.orig 2019-09-17 14:05:56 UTC +--- ext/cli/foreground.orig 2025-08-24 18:44:03 UTC +++ ext/cli/foreground @@ -1,6 +1,6 @@ #!/usr/bin/env bash -restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter" +restartfile="/var/puppet/server/data/puppetserver/restartcounter" cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then -@@ -30,7 +30,7 @@ fi +@@ -30,7 +30,7 @@ COMMAND="${JAVA_BIN} ${JAVA_ARGS} ${LOG_APPENDER} \ COMMAND="${JAVA_BIN} ${JAVA_ARGS} ${LOG_APPENDER} \ -cp "$CLASSPATH" \ clojure.main -m puppetlabs.trapperkeeper.main \ - --config ${CONFIG} --bootstrap-config ${BOOTSTRAP_CONFIG} \ + --config ${CONFIG} --bootstrap-config %%ETCDIR%%/services.d \ --restart-file "${restartfile}" \ ${TK_ARGS} \ ${@}" diff --git a/sysutils/openvox-server8/files/patch-ext__ezbake-functions.sh b/sysutils/openvox-server8/files/patch-ext__ezbake-functions.sh deleted file mode 100644 index bd4d0a1c26b7..000000000000 --- a/sysutils/openvox-server8/files/patch-ext__ezbake-functions.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/ezbake-functions.sh.orig 2019-09-17 14:05:56 UTC -+++ ext/ezbake-functions.sh -@@ -126,7 +126,7 @@ init_restart_file() - local group="${GROUP:-puppet}" - - if [ ! -e "$restartfile" ]; then -- /usr/bin/install --directory --owner=$user --group=$group --mode=755 "$restart_file_base_dir" -+ /usr/bin/install -d -o $user -g $group -m 755 "$restart_file_base_dir" - if [ $? -ne 0 ]; then - echo "Unable to create or set permissions for restart file at ${restart_file_base_dir}" 1>&2 - return 1 diff --git a/sysutils/openvox-server8/pkg-plist b/sysutils/openvox-server8/pkg-plist index 329a3c5f8901..e4c12f025c03 100644 --- a/sysutils/openvox-server8/pkg-plist +++ b/sysutils/openvox-server8/pkg-plist @@ -1,29 +1,25 @@ @(,,750) bin/puppetserver @sample %%ETCDIR%%/logback.xml.sample @sample %%ETCDIR%%/request-logging.xml.sample @sample %%ETCDIR%%/conf.d/auth.conf.sample @sample %%ETCDIR%%/conf.d/global.conf.sample @sample %%ETCDIR%%/conf.d/metrics.conf.sample @sample %%ETCDIR%%/conf.d/puppetserver.conf.sample @sample %%ETCDIR%%/conf.d/web-routes.conf.sample @sample %%ETCDIR%%/conf.d/webserver.conf.sample @sample %%ETCDIR%%/services.d/bootstrap.cfg.sample @sample %%ETCDIR%%/services.d/ca.cfg.sample @dir(,puppet,750) etc/puppet/code %%DATADIR%%/puppet-server-release.jar @(,,755) %%DATADIR%%/cli/apps/ca @(,,755) %%DATADIR%%/cli/apps/foreground @(,,755) %%DATADIR%%/cli/apps/gem @(,,755) %%DATADIR%%/cli/apps/irb -@(,,755) %%DATADIR%%/cli/apps/reload @(,,755) %%DATADIR%%/cli/apps/ruby -@(,,755) %%DATADIR%%/cli/apps/start -@(,,755) %%DATADIR%%/cli/apps/stop @(,,755) %%DATADIR%%/cli/cli-defaults.sh -@(,,755) %%DATADIR%%/ezbake-functions.sh @dir(puppet,puppet,750) /var/log/puppetserver @dir(puppet,puppet,755) /var/puppet @dir(puppet,puppet,750) /var/puppet/server @dir(puppet,puppet,750) /var/puppet/server/data @dir(puppet,puppet,750) /var/puppetserver @dir(puppet,puppet,750) /var/run/puppetserver