Date: Thu, 1 Jun 2023 18:56:47 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 03835de80278 - main - cleanup: Remove expired puppet6 ports: Message-ID: <202306011856.351IulFQ046694@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=03835de8027887144119ed64e066c67d7981e829 commit 03835de8027887144119ed64e066c67d7981e829 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2023-06-01 18:56:11 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2023-06-01 18:56:38 +0000 cleanup: Remove expired puppet6 ports: 2023-06-01 sysutils/puppet6: Puppet 6 has reached EOL 2023-06-01 sysutils/puppetserver6: Puppet 6 has reached EOL 2023-06-01 databases/puppetdb6: Puppet 6 has reached EOL 2023-06-01 databases/puppetdb-terminus6: Puppet 6 has reached EOL --- MOVED | 4 + databases/Makefile | 2 - databases/puppetdb-terminus6/Makefile | 27 -- databases/puppetdb-terminus6/distinfo | 3 - databases/puppetdb-terminus6/files/patch-Makefile | 58 ---- databases/puppetdb-terminus6/pkg-descr | 1 - databases/puppetdb-terminus6/pkg-plist | 17 -- databases/puppetdb6/Makefile | 53 ---- databases/puppetdb6/distinfo | 3 - databases/puppetdb6/files/patch-Makefile | 39 --- databases/puppetdb6/files/patch-ext_bin_puppetdb | 15 - databases/puppetdb6/files/patch-ext_cli_ssl-setup | 11 - .../files/patch-ext_config_conf.d_config.ini | 15 - .../files/patch-ext_config_conf.d_jetty.ini | 8 - .../puppetdb6/files/patch-ext_config_logback.xml | 29 -- .../files/patch-ext_config_request-logging.xml | 14 - databases/puppetdb6/files/pkg-message.in | 12 - databases/puppetdb6/files/puppetdb.in | 89 ------ databases/puppetdb6/pkg-descr | 1 - databases/puppetdb6/pkg-plist | 23 -- sysutils/Makefile | 2 - sysutils/puppet6/Makefile | 144 --------- sysutils/puppet6/distinfo | 23 -- ...atch-lib_puppet_provider_service_daemontools.rb | 20 -- sysutils/puppet6/files/pkg-message.in | 11 - sysutils/puppet6/files/puppet.in | 46 --- sysutils/puppet6/pkg-descr | 5 - sysutils/puppet6/pkg-plist | 329 --------------------- sysutils/puppetserver6/Makefile | 100 ------- sysutils/puppetserver6/distinfo | 5 - .../files/patch-ext__bin__puppetserver | 15 - .../puppetserver6/files/patch-ext__cli__foreground | 19 -- .../files/patch-ext__cli_defaults__cli-defaults.sh | 12 - .../files/patch-ext__config__conf.d__global.conf | 9 - .../patch-ext__config__conf.d__puppetserver.conf | 55 ---- .../patch-ext__config__conf.d__webserver.conf | 9 - .../files/patch-ext__config__logback.xml | 17 -- .../files/patch-ext__config__request-logging.xml | 15 - .../files/patch-ext__ezbake-functions.sh | 11 - sysutils/puppetserver6/files/patch-ffi.rb | 19 -- sysutils/puppetserver6/files/pkg-message.in | 17 -- sysutils/puppetserver6/files/puppetserver.in | 95 ------ sysutils/puppetserver6/pkg-descr | 11 - sysutils/puppetserver6/pkg-plist | 30 -- 44 files changed, 4 insertions(+), 1439 deletions(-) diff --git a/MOVED b/MOVED index 665de4440489..d38d9319da74 100644 --- a/MOVED +++ b/MOVED @@ -7600,3 +7600,7 @@ ftp/ftpmirror||2023-05-31|Has expired: Abandonware net-p2p/zetacoin||2023-06-01|Has expired: Broken for nearly a year net-p2p/zetacoin-daemon||2023-06-01|Has expired: Broken for nearly a year net-p2p/zetacoin-utils||2023-06-01|Has expired: Broken for nearly a year +sysutils/puppet6|sysutils/puppet7|2023-06-01|Has expired: Puppet 6 has reached EOL +sysutils/puppetserver6|sysutils/puppetserver7|2023-06-01|Has expired: Puppet 6 has reached EOL +databases/puppetdb6|databases/puppetdb7|2023-06-01|Has expired: Puppet 6 has reached EOL +databases/puppetdb-terminus6|databases/puppetdb-terminus7|2023-06-01|Has expired: Puppet 6 has reached EOL diff --git a/databases/Makefile b/databases/Makefile index b8ff199d6db4..e6e3be1338e9 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -719,10 +719,8 @@ SUBDIR += proftpd-mod_sql_tds SUBDIR += prometheus-postgresql-adapter SUBDIR += pspg - SUBDIR += puppetdb-terminus6 SUBDIR += puppetdb-terminus7 SUBDIR += puppetdb-terminus8 - SUBDIR += puppetdb6 SUBDIR += puppetdb7 SUBDIR += puppetdb8 SUBDIR += puredb diff --git a/databases/puppetdb-terminus6/Makefile b/databases/puppetdb-terminus6/Makefile deleted file mode 100644 index 61ef379fdefb..000000000000 --- a/databases/puppetdb-terminus6/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -PORTNAME= puppetdb-terminus -PORTVERSION= 6.22.1 -CATEGORIES= databases ruby -MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ -PKGNAMESUFFIX= 6 -DISTNAME= puppetdb-${PORTVERSION} - -MAINTAINER= puppet@FreeBSD.org -COMMENT= PuppetDB storeconfigs backend terminus module -WWW= https://docs.puppetlabs.com/puppetdb/latest/ - -LICENSE= APACHE20 - -DEPRECATED= Puppet 6 has reached EOL -EXPIRATION_DATE=2023-06-01 - -CONFLICTS_INSTALL= puppetdb-terminus[0-9] -NO_BUILD= yes -USES= gmake ruby - -post-patch: - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile - -do-install: - @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini - -.include <bsd.port.mk> diff --git a/databases/puppetdb-terminus6/distinfo b/databases/puppetdb-terminus6/distinfo deleted file mode 100644 index f83677cc455a..000000000000 --- a/databases/puppetdb-terminus6/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1663350139 -SHA256 (puppetdb-6.22.1.tar.gz) = bc77e244411fcc49398ab8f50a28e39ea4424f92f1a94c27c084b8ae7499679b -SIZE (puppetdb-6.22.1.tar.gz) = 48848603 diff --git a/databases/puppetdb-terminus6/files/patch-Makefile b/databases/puppetdb-terminus6/files/patch-Makefile deleted file mode 100644 index a01cbdc3477b..000000000000 --- a/databases/puppetdb-terminus6/files/patch-Makefile +++ /dev/null @@ -1,58 +0,0 @@ ---- Makefile.orig 2022-08-01 21:19:05 UTC -+++ Makefile -@@ -1,7 +1,7 @@ - prefix = /usr/local - datadir = $(prefix)/share - confdir = /etc --rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']") -+rubylibdir = $(shell %%PREFIX%%/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']") - rundir = /var/run - bindir = /usr/bin - -@@ -36,22 +36,30 @@ install-puppetdb: - - - install-puppetdb-termini: -- install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb" -- install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb" -- install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb" -- install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb" -- install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb" -- install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb" -- install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb" -- install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb" -- install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb" -- install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb" -- install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb" -- install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb" -- install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb" -- install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb" -- install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb" -- install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb" -+ install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb" -+ install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb" -+ install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb" -+ install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb" -+ install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb" -+ install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb" -+ install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb" -+ install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb" -+ install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb" -+ install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb" -+ install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb" -+ install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb" -+ install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb" -+ install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb" -+ install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb" -+ install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb" - - install-rpm-sysv-init: install-rpm-preinst - install -d -m 0755 "$(DESTDIR)$(initdir)" diff --git a/databases/puppetdb-terminus6/pkg-descr b/databases/puppetdb-terminus6/pkg-descr deleted file mode 100644 index 4d64063e8c6e..000000000000 --- a/databases/puppetdb-terminus6/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -The PuppetDB storeconfigs backend terminus module. diff --git a/databases/puppetdb-terminus6/pkg-plist b/databases/puppetdb-terminus6/pkg-plist deleted file mode 100644 index a12b86eb6a1a..000000000000 --- a/databases/puppetdb-terminus6/pkg-plist +++ /dev/null @@ -1,17 +0,0 @@ -%%RUBY_SITELIBDIR%%/puppet/face/node/deactivate.rb -%%RUBY_SITELIBDIR%%/puppet/face/node/status.rb -%%RUBY_SITELIBDIR%%/puppet/functions/puppetdb_query.rb -%%RUBY_SITELIBDIR%%/puppet/indirector/catalog/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb_apply.rb -%%RUBY_SITELIBDIR%%/puppet/indirector/node/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/indirector/resource/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/reports/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/atom.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/char_encoding.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command_names.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/config.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/http.rb - diff --git a/databases/puppetdb6/Makefile b/databases/puppetdb6/Makefile deleted file mode 100644 index 81912224e8a2..000000000000 --- a/databases/puppetdb6/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -PORTNAME= puppetdb -PORTVERSION= 6.22.1 -CATEGORIES= databases java -MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ -PKGNAMESUFFIX= 6 - -MAINTAINER= puppet@FreeBSD.org -COMMENT= PuppetDB storeconfigs backend -WWW= https://docs.puppetlabs.com/puppetdb/latest/ - -LICENSE= APACHE20 - -DEPRECATED= Puppet 6 has reached EOL -EXPIRATION_DATE=2023-06-01 - -RUN_DEPENDS= bash:shells/bash - -USE_RC_SUBR= puppetdb - -CONFLICTS_INSTALL= puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample -USES= cpe shebangfix -CPE_VENDOR= puppet -SHEBANG_FILES= ext/bin/puppetdb \ - ext/cli/anonymize \ - ext/cli/config-migration \ - ext/cli/foreground \ - ext/cli/ssl-setup \ - ext/cli/start \ - ext/cli/stop \ - ext/cli/reload \ - ext/cli/upgrade \ - ext/ezbake-functions.sh -USE_JAVA= yes -NO_ARCH= yes -NO_BUILD= yes - -USERS= puppetdb -GROUPS= puppetdb - -SUB_LIST= JAVA_HOME=${JAVA_HOME} -SUB_FILES= pkg-message - -post-patch: -.for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \ - ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} -.endfor - @${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb - -do-install: - @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb - -.include <bsd.port.mk> diff --git a/databases/puppetdb6/distinfo b/databases/puppetdb6/distinfo deleted file mode 100644 index 3ff2e6a73bf9..000000000000 --- a/databases/puppetdb6/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1663350175 -SHA256 (puppetdb-6.22.1.tar.gz) = bc77e244411fcc49398ab8f50a28e39ea4424f92f1a94c27c084b8ae7499679b -SIZE (puppetdb-6.22.1.tar.gz) = 48848603 diff --git a/databases/puppetdb6/files/patch-Makefile b/databases/puppetdb6/files/patch-Makefile deleted file mode 100644 index 6e34d619fbeb..000000000000 --- a/databases/puppetdb6/files/patch-Makefile +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.orig 2022-08-01 21:19:05 UTC -+++ Makefile -@@ -1,24 +1,24 @@ --prefix = /usr/local -+prefix = %%PREFIX%% - datadir = $(prefix)/share --confdir = /etc -+confdir = %%PREFIX%%/etc - rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']") - rundir = /var/run --bindir = /usr/bin -+bindir = %%PREFIX%%/bin - - install-puppetdb: - install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb" - install -m 0644 puppetdb.jar "$(DESTDIR)$(datadir)/puppetdb" - install -m 0774 ext/ezbake-functions.sh "$(DESTDIR)$(datadir)/puppetdb" - install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb" -- install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d" -- install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini" -- install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini" -- install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/auth.conf" -- install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini" -- install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini" -- install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg" -- install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml" -- install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml" -+ install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d" -+ install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample" -+ install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample" -+ install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.sample" -+ install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample" -+ install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample" -+ install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample" -+ install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample" -+ install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample" - install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli" - install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps" - install -d -m 0755 "$(DESTDIR)$(bindir)" diff --git a/databases/puppetdb6/files/patch-ext_bin_puppetdb b/databases/puppetdb6/files/patch-ext_bin_puppetdb deleted file mode 100644 index 0a139b110d2e..000000000000 --- a/databases/puppetdb6/files/patch-ext_bin_puppetdb +++ /dev/null @@ -1,15 +0,0 @@ ---- ext/bin/puppetdb.orig 2016-03-17 04:17:10 UTC -+++ ext/bin/puppetdb -@@ -5,6 +5,12 @@ if [ -r "/etc/default/puppetdb" ] ; then - . /etc/default/puppetdb - elif [ -r "/etc/sysconfig/puppetdb" ] ; then - . /etc/sysconfig/puppetdb -+elif [ `uname` == "FreeBSD" ] ; then -+ CONFIG="%%PREFIX%%/etc/puppetdb/conf.d" -+ INSTALL_DIR="%%DATADIR%%" -+ JAVA_BIN="%%PREFIX%%/bin/java" -+ JAVA_ARGS="-Xmx192m" -+ USER="puppet" - elif [ `uname` == "OpenBSD" ] ; then - JAVA_BIN=$(javaPathHelper -c puppetdb) - JAVA_ARGS="-Xmx192m" diff --git a/databases/puppetdb6/files/patch-ext_cli_ssl-setup b/databases/puppetdb6/files/patch-ext_cli_ssl-setup deleted file mode 100644 index ab86d849142d..000000000000 --- a/databases/puppetdb6/files/patch-ext_cli_ssl-setup +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/cli/ssl-setup.orig 2016-03-17 04:17:10 UTC -+++ ext/cli/ssl-setup -@@ -230,7 +230,7 @@ else - user=puppetdb - group=puppetdb - -- puppetdb_confdir="/etc/puppetlabs/puppetdb" -+ puppetdb_confdir="%%PREFIX%%/etc/puppetdb" - fi - - set -e diff --git a/databases/puppetdb6/files/patch-ext_config_conf.d_config.ini b/databases/puppetdb6/files/patch-ext_config_conf.d_config.ini deleted file mode 100644 index 390068840508..000000000000 --- a/databases/puppetdb6/files/patch-ext_config_conf.d_config.ini +++ /dev/null @@ -1,15 +0,0 @@ ---- ext/config/conf.d/config.ini.orig 2016-03-17 04:17:06 UTC -+++ ext/config/conf.d/config.ini -@@ -3,10 +3,10 @@ - - [global] - # Store mq/db data in a custom directory --vardir = /opt/puppetlabs/server/data/puppetdb -+vardir = /var/db/puppetdb - - # Use an external logback config file --logging-config = /etc/puppetlabs/puppetdb/logback.xml -+logging-config = %%PREFIX%%/etc/puppetdb/logback.xml - - [command-processing] - # How many command-processing threads to use, defaults to (CPUs / 2) diff --git a/databases/puppetdb6/files/patch-ext_config_conf.d_jetty.ini b/databases/puppetdb6/files/patch-ext_config_conf.d_jetty.ini deleted file mode 100644 index 42d5665a0f64..000000000000 --- a/databases/puppetdb6/files/patch-ext_config_conf.d_jetty.ini +++ /dev/null @@ -1,8 +0,0 @@ ---- ext/config/conf.d/jetty.ini.orig 2016-03-17 04:17:06 UTC -+++ ext/config/conf.d/jetty.ini -@@ -30,4 +30,4 @@ port = 8080 - - # Access logging configuration path. To turn off access logging - # comment out the line with `access-log-config=...` --access-log-config = /etc/puppetlabs/puppetdb/request-logging.xml -+access-log-config = %%PREFIX%%/etc/puppetdb/request-logging.xml diff --git a/databases/puppetdb6/files/patch-ext_config_logback.xml b/databases/puppetdb6/files/patch-ext_config_logback.xml deleted file mode 100644 index 08cb543440aa..000000000000 --- a/databases/puppetdb6/files/patch-ext_config_logback.xml +++ /dev/null @@ -1,29 +0,0 @@ ---- ext/config/logback.xml.orig 2017-04-24 12:27:57.366296793 -0700 -+++ ext/config/logback.xml 2017-04-24 12:28:48.723259627 -0700 -@@ -6,10 +6,10 @@ - </appender> - - <appender name="F1" class="ch.qos.logback.core.rolling.RollingFileAppender"> -- <file>/var/log/puppetlabs/puppetdb/puppetdb.log</file> -+ <file>/var/log/puppetdb/puppetdb.log</file> - <append>true</append> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> -- <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> -+ <fileNamePattern>/var/log/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> - <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total--> - <maxFileSize>200MB</maxFileSize> - <maxHistory>90</maxHistory> -@@ -31,11 +31,11 @@ - level="info"/> - - <appender name="STATUS" class="ch.qos.logback.core.rolling.RollingFileAppender"> -- <file>/var/log/puppetlabs/puppetdb/puppetdb-status.log</file> -+ <file>/var/log/puppetdb/puppetdb-status.log</file> - <append>true</append> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <!-- rollover daily --> -- <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-status-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> -+ <fileNamePattern>/var/log/puppetdb/puppetdb-status-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> - <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total--> - <maxFileSize>200MB</maxFileSize> - <maxHistory>90</maxHistory> diff --git a/databases/puppetdb6/files/patch-ext_config_request-logging.xml b/databases/puppetdb6/files/patch-ext_config_request-logging.xml deleted file mode 100644 index 51b90d0e844e..000000000000 --- a/databases/puppetdb6/files/patch-ext_config_request-logging.xml +++ /dev/null @@ -1,14 +0,0 @@ ---- ext/config/request-logging.xml.orig 2017-04-24 12:32:16.604464262 -0700 -+++ ext/config/request-logging.xml 2017-04-24 12:32:46.404637027 -0700 -@@ -1,9 +1,9 @@ - <configuration debug="false"> - <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> -- <file>/var/log/puppetlabs/puppetdb/puppetdb-access.log</file> -+ <file>/var/log/puppetdb/puppetdb-access.log</file> - <append>true</append> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> -- <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> -+ <fileNamePattern>/var/log/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> - <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total--> - <maxFileSize>200MB</maxFileSize> - <maxHistory>90</maxHistory> diff --git a/databases/puppetdb6/files/pkg-message.in b/databases/puppetdb6/files/pkg-message.in deleted file mode 100644 index fba773047854..000000000000 --- a/databases/puppetdb6/files/pkg-message.in +++ /dev/null @@ -1,12 +0,0 @@ -[ -{ type: install - message: <<EOM -If this is a new installation, please run the follow to setup your SSL/puppetdb -server: - -%%PREFIX%%/bin/puppetdb ssl-setup - -Please also remember to add puppetdb_enable="YES" into your rc.conf. -EOM -} -] diff --git a/databases/puppetdb6/files/puppetdb.in b/databases/puppetdb6/files/puppetdb.in deleted file mode 100644 index 4e2f85a2d366..000000000000 --- a/databases/puppetdb6/files/puppetdb.in +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -# PROVIDE: puppetdb -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Configuration settings for puppetdb in /etc/rc.conf: -# -# puppetdb_enable (bool): -# Set to "NO" by default. -# Set it to "YES" to enable puppetdb -# -# puppetdb_args (str): -# Extra arguments passed to start command -# -# puppetdb_java_home (str): -# Set to "%%JAVA_HOME%%" by default. -# Set the Java virtual machine to run puppetdb -# -# puppetdb_java_opts (str): -# Set to "" by default. -# Java VM args to use. -# -# puppetdb_user (str): -# Set to "puppetdb" by default. -# User to run puppetdb as. -# -# puppetdb_group (str): -# Set to "puppetdb" by default. -# Group for data file ownership. -# -# puppetdb_log_file (str): -# Set to "/var/log/puppetdb/puppetdb.log" by default. -# Log file location. -# - -. /etc/rc.subr - -name="puppetdb" -rcvar=puppetdb_enable - -load_rc_config "${name}" - -: ${puppetdb_enable="NO"} -: ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"} -: ${puppetdb_java_home="%%JAVA_HOME%%"} -: ${puppetdb_user="puppetdb"} -: ${puppetdb_group="puppetdb"} -: ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"} - -pidfile="/var/run/puppetdb/puppetdb.pid" -command="/usr/sbin/daemon" -java_cmd="${puppetdb_java_home}/bin/java" -procname="${java_cmd}" -command_args="-p ${pidfile} ${java_cmd} ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core ${puppetdb_args} > ${puppetdb_log_file} 2>&1" - - -required_files="${java_cmd}" - -start_precmd="puppetdb_prestart" - -puppetdb_prestart() { - if [ ! -d "/var/log/puppetdb" ]; then - install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/log/puppetdb" - fi - if [ ! -f "${puppetdb_log_file}" ]; then - touch "${puppetdb_log_file}" - chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}" - chmod 640 "${puppetdb_log_file}" - fi - if [ ! -d "/var/run/puppetdb" ]; then - install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb" - fi - - chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d" - chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d" - - chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml" - chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml" - - if [ ! -d "/var/db/puppetdb" ]; then - install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/db/puppetdb" - fi - chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb" - chmod 0750 "/var/db/puppetdb" -} - -run_rc_command "$1" diff --git a/databases/puppetdb6/pkg-descr b/databases/puppetdb6/pkg-descr deleted file mode 100644 index b76f9bc98577..000000000000 --- a/databases/puppetdb6/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -The PuppetDB storeconfigs backend diff --git a/databases/puppetdb6/pkg-plist b/databases/puppetdb6/pkg-plist deleted file mode 100644 index 91c4e1df6246..000000000000 --- a/databases/puppetdb6/pkg-plist +++ /dev/null @@ -1,23 +0,0 @@ -bin/puppetdb -%%DATADIR%%/cli/apps/anonymize -%%DATADIR%%/cli/apps/config-migration -%%DATADIR%%/cli/apps/delete-reports -%%DATADIR%%/cli/apps/foreground -%%DATADIR%%/cli/apps/ssl-setup -%%DATADIR%%/cli/apps/start -%%DATADIR%%/cli/apps/stop -%%DATADIR%%/cli/apps/reload -%%DATADIR%%/cli/apps/upgrade -%%DATADIR%%/ezbake-functions.sh -%%DATADIR%%/ezbake.manifest -%%DATADIR%%/puppetdb.jar -@group puppetdb -@sample etc/puppetdb/bootstrap.cfg.sample -@sample etc/puppetdb/conf.d/auth.conf.sample -@sample etc/puppetdb/conf.d/config.ini.sample -@sample etc/puppetdb/conf.d/database.ini.sample -@sample etc/puppetdb/conf.d/jetty.ini.sample -@sample etc/puppetdb/conf.d/repl.ini.sample -@sample etc/puppetdb/logback.xml.sample -@sample etc/puppetdb/request-logging.xml.sample -@group diff --git a/sysutils/Makefile b/sysutils/Makefile index 1050d9ceaffd..d339421766e2 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1060,10 +1060,8 @@ SUBDIR += pstree SUBDIR += puppet-lint SUBDIR += puppet-mode.el - SUBDIR += puppet6 SUBDIR += puppet7 SUBDIR += puppet8 - SUBDIR += puppetserver6 SUBDIR += puppetserver7 SUBDIR += puppetserver8 SUBDIR += pv diff --git a/sysutils/puppet6/Makefile b/sysutils/puppet6/Makefile deleted file mode 100644 index c16cebbed1f2..000000000000 --- a/sysutils/puppet6/Makefile +++ /dev/null @@ -1,144 +0,0 @@ -PORTNAME= puppet -PORTVERSION= 6.28.0 -PORTREVISION= 4 -CATEGORIES= sysutils -MASTER_SITES= https://forge.puppet.com/v3/files/:forge -PKGNAMESUFFIX= 6 - -MAINTAINER= puppet@FreeBSD.org -COMMENT= Configuration management framework written in Ruby -WWW= https://puppet.com/docs/puppet/latest/puppet_index.html - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Puppet 6 has reached EOL -EXPIRATION_DATE=2023-06-01 -BROKEN_RUBY30= yes -BROKEN_RUBY31= yes -BROKEN_RUBY32= yes - -RUN_DEPENDS= rubygem-concurrent-ruby11>=1.0:devel/rubygem-concurrent-ruby11 \ - rubygem-deep_merge>=1.0:devel/rubygem-deep_merge \ - rubygem-fast_gettext1>=1.1:devel/rubygem-fast_gettext1 \ - rubygem-ffi>=1.9.24:devel/rubygem-ffi \ - rubygem-hiera>=3.2.1:sysutils/rubygem-hiera \ - rubygem-httpclient>=2.8:www/rubygem-httpclient \ - rubygem-locale>=2.1:devel/rubygem-locale \ - rubygem-multi_json>=1.10:devel/rubygem-multi_json \ - rubygem-puppet-resource_api>=0:devel/rubygem-puppet-resource_api \ - rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas \ - rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet - -USES= cpe ruby -USE_GITHUB= yes -GH_ACCOUNT= puppetlabs - -CONFLICTS_INSTALL= puppet[0-9] -PLIST_SUB= PORTVERSION="${PORTVERSION}" -NO_ARCH= yes -NO_BUILD= yes -USE_RC_SUBR= puppet -PORTDOCS= LICENSE README.md -PORTEXAMPLES= * -USERS= puppet -GROUPS= puppet -SUB_FILES+= pkg-message -SUB_LIST= RUBY=${RUBY} - -OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_DEFAULT= CFACTER -OPTIONS_RADIO= FACTER -OPTIONS_RADIO_FACTER= CFACTER RFACTER - -RFACTER_DESC= Use facter 4.x (future facter, written in Ruby) -CFACTER_DESC= Use facter 3.x (written in C++) - -RFACTER_BUILD_DEPENDS= rubygem-facter>=4.0:sysutils/rubygem-facter -RFACTER_RUN_DEPENDS= rubygem-facter>=4.0:sysutils/rubygem-facter - -CFACTER_BUILD_DEPENDS= facter>=3.0:sysutils/facter -CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter - -# Get versions from -# https://github.com/puppetlabs/puppet-agent/tree/6.x/configs/components -FORGE_MODULES= augeas_core=1.1.2 \ - cron_core=1.0.5 \ - host_core=1.0.3 \ - mount_core=1.0.4 \ - scheduled_task=1.0.0 \ - selinux_core=1.1.0 \ - sshkeys_core=1.0.3 \ - yumrepo_core=1.0.7 \ - zfs_core=1.2.0 \ - zone_core=1.0.3 - -.for module in ${FORGE_MODULES} -DISTFILES+= puppetlabs-${module:C/=.*//}-${module:C/.*=//}.tar.gz:forge -.endfor - -post-patch: - @${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/reference/configuration.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/etc/puppetlabs/code|${ETCDIR}|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/reference/configuration.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/cache|/var/puppet|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/reference/configuration.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/var/run/puppetlabs|/var/run/puppet|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/var/log/puppetlabs/puppet|/var/log/puppet|" \ - ${WRKSRC}/install.rb \ - ${WRKSRC}/lib/puppet/util/run_mode.rb - @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/modules|${ETCDIR}/modules|" \ - -e "s|/opt/puppetlabs/puppet/vendor_modules|${ETCDIR}/vendor_modules|" \ - ${WRKSRC}/lib/puppet/defaults.rb - @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/bin/gem|${LOCALBASE}/bin/gem|" \ - ${WRKSRC}/lib/puppet/provider/package/puppet_gem.rb - @${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \ - ${WRKSRC}/lib/puppet/defaults.rb - @${REINPLACE_CMD} -e "s|\.\./\.\./\.\./locales|../locales|" \ - ${WRKSRC}/lib/puppet/gettext/config.rb - -do-install: - @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ - --localedir=${RUBY_SITELIBDIR}/puppet/locales - -post-install: - ${MKDIR} ${STAGEDIR}${ETCDIR}/manifests - ${MKDIR} ${STAGEDIR}${ETCDIR}/modules - ${MKDIR} ${STAGEDIR}${ETCDIR}/vendor_modules -.for module in ${FORGE_MODULES} - (cd ${WRKDIR}/puppetlabs-${module:C/=.*//}-${module:C/.*=//} && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/vendor_modules/${module:C/=.*//}) -.endfor - ${MKDIR} ${STAGEDIR}/var/puppet - ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist - ${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ - --confdir=${ETCDIR} \ - --rundir=/var/run/puppet \ - --vardir=/var/puppet \ - --logdir=/var/log/puppet \ - --codedir=${ETCDIR} \ - > ${STAGEDIR}${ETCDIR}/puppet.conf-dist - @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \ - ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ - ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications - ${INSTALL_DATA} ${WRKSRC}/.gemspec ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications/${PORTNAME}-${PORTVERSION}.gemspec - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} - -post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} - -.include <bsd.port.mk> diff --git a/sysutils/puppet6/distinfo b/sysutils/puppet6/distinfo deleted file mode 100644 index 9323296a43ad..000000000000 --- a/sysutils/puppet6/distinfo +++ /dev/null @@ -1,23 +0,0 @@ -TIMESTAMP = 1659762237 -SHA256 (puppetlabs-augeas_core-1.1.2.tar.gz) = f57405c4d42162f0b77c211d3092b678f90da54c270f2fb4bf3648562a70cf11 -SIZE (puppetlabs-augeas_core-1.1.2.tar.gz) = 24037 -SHA256 (puppetlabs-cron_core-1.0.5.tar.gz) = 3b792d2c5e87115573812cac405ab6f365b90f9a0c87601a12957f604f5bbb8b -SIZE (puppetlabs-cron_core-1.0.5.tar.gz) = 23287 -SHA256 (puppetlabs-host_core-1.0.3.tar.gz) = 25d970e1dbb0fd6da9206ac48eb8b7caf4b9c0f909b0876633d8500fbd461e07 -SIZE (puppetlabs-host_core-1.0.3.tar.gz) = 24672 -SHA256 (puppetlabs-mount_core-1.0.4.tar.gz) = 0dba04cf6aa85735d5e7ecc643000f36b987e281363ea77594cf41c904d43a05 -SIZE (puppetlabs-mount_core-1.0.4.tar.gz) = 40641 -SHA256 (puppetlabs-scheduled_task-1.0.0.tar.gz) = 4cd2a99a9aecb39a19a27bb1f18e26e587a94d93643ab1f52f652c4aa5daa6c6 -SIZE (puppetlabs-scheduled_task-1.0.0.tar.gz) = 34552 -SHA256 (puppetlabs-selinux_core-1.1.0.tar.gz) = b87410571c6b04e368c90b8d8fb42ccd3169e2d6ced53a04446e25fd0b2054d7 -SIZE (puppetlabs-selinux_core-1.1.0.tar.gz) = 14951 -SHA256 (puppetlabs-sshkeys_core-1.0.3.tar.gz) = 4a13c5ee9895c6e27a001b3050920b8e7e783b927acc357111206d31fb0eb830 -SIZE (puppetlabs-sshkeys_core-1.0.3.tar.gz) = 40342 -SHA256 (puppetlabs-yumrepo_core-1.0.7.tar.gz) = 551fbc913c9b85293e0e0215b537af188b527beb04b3a824775529fd0e6c7c49 -SIZE (puppetlabs-yumrepo_core-1.0.7.tar.gz) = 29409 -SHA256 (puppetlabs-zfs_core-1.2.0.tar.gz) = b587e183c086bba1e9e48045a07a185880e272c16fec1455c8b485579956e273 -SIZE (puppetlabs-zfs_core-1.2.0.tar.gz) = 17676 -SHA256 (puppetlabs-zone_core-1.0.3.tar.gz) = 02a0dad968b5cc410487a8e648806bac17ff05984c96361b1ed5dfed5acbcd94 -SIZE (puppetlabs-zone_core-1.0.3.tar.gz) = 29746 -SHA256 (puppetlabs-puppet-6.28.0_GH0.tar.gz) = 00b1ce045f24c931f9988f378d662b35aa8586065174c0de7eed3c221ac7b05c -SIZE (puppetlabs-puppet-6.28.0_GH0.tar.gz) = 3352341 diff --git a/sysutils/puppet6/files/patch-lib_puppet_provider_service_daemontools.rb b/sysutils/puppet6/files/patch-lib_puppet_provider_service_daemontools.rb deleted file mode 100644 index 3857c824a1ba..000000000000 --- a/sysutils/puppet6/files/patch-lib_puppet_provider_service_daemontools.rb +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/puppet/provider/service/daemontools.rb.orig 2016-04-25 18:52:09 UTC -+++ lib/puppet/provider/service/daemontools.rb -@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :dae - - EOT - -- commands :svc => "/usr/bin/svc", :svstat => "/usr/bin/svstat" -+ commands :svc => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat" - - class << self - attr_writer :defpath -@@ -88,7 +88,7 @@ Puppet::Type.type(:service).provide :dae - # find the service dir on this node - def servicedir - unless @servicedir -- ["/service", "/etc/service","/var/lib/svscan"].each do |path| -+ ["/var/service", "/etc/service","/var/lib/svscan"].each do |path| - if Puppet::FileSystem.exist?(path) - @servicedir = path - break diff --git a/sysutils/puppet6/files/pkg-message.in b/sysutils/puppet6/files/pkg-message.in deleted file mode 100644 index caa220715594..000000000000 --- a/sysutils/puppet6/files/pkg-message.in +++ /dev/null @@ -1,11 +0,0 @@ -[ -{ type: install - message: <<EOM -To enable the puppet agent, add the following to /etc/rc.conf: - - puppet_enable="YES" - -The default PID directory is /var/run/puppet -EOM -} -] diff --git a/sysutils/puppet6/files/puppet.in b/sysutils/puppet6/files/puppet.in deleted file mode 100644 index fbdfef003ed5..000000000000 --- a/sysutils/puppet6/files/puppet.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -# PROVIDE: puppet -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable the puppet agent: -# -# puppet_enable="YES" - -. /etc/rc.subr - -name="puppet" -rcvar=puppet_enable - -load_rc_config "$name" - -: ${puppet_enable="NO"} -: ${puppet_rundir="/var/run/puppet"} - -command="%%PREFIX%%/bin/puppet" -command_args="agent ${puppet_flags} --rundir=${puppet_rundir}" -command_interpreter=%%RUBY%% -unset puppet_flags - -pidfile="${puppet_rundir}/agent.pid" -start_precmd="install -d -o puppet -g puppet ${pidfile%/*}" - -PATH="${PATH}:%%PREFIX%%/bin:%%PREFIX%%/sbin" - -# An UTF-8 locale is required -: LC_ALL=${LC_ALL:=C.UTF-8} -case $LC_ALL in - *.UTF-8) - ;; - *.*) - LC_ALL="${LC_ALL%.*}.UTF-8" - ;; - *) - LC_ALL=C.UTF-8 - ;; -esac -export LC_ALL - -run_rc_command "$1" diff --git a/sysutils/puppet6/pkg-descr b/sysutils/puppet6/pkg-descr deleted file mode 100644 index 2ee78c6e21be..000000000000 --- a/sysutils/puppet6/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Puppet lets you centrally manage every important aspect of your system using -a cross-platform specification language that manages all the separate -elements normally aggregated in different files, like users, cron jobs, and -hosts, along with obviously discrete elements like packages, services, and -files. diff --git a/sysutils/puppet6/pkg-plist b/sysutils/puppet6/pkg-plist deleted file mode 100644 index a06edacbe0d4..000000000000 --- a/sysutils/puppet6/pkg-plist +++ /dev/null @@ -1,329 +0,0 @@ -bin/puppet -%%ETCDIR%%/auth.conf-dist -%%ETCDIR%%/puppet.conf-dist -%%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml -%%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/static_code_analysis.yaml -%%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml -%%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/unit_tests_with_released_puppet_gem.yaml -%%ETCDIR%%/vendor_modules/augeas_core/.puppet-lint.rc -%%ETCDIR%%/vendor_modules/augeas_core/.sync.yml -%%ETCDIR%%/vendor_modules/augeas_core/CHANGELOG.md -%%ETCDIR%%/vendor_modules/augeas_core/CODEOWNERS -%%ETCDIR%%/vendor_modules/augeas_core/LICENSE -%%ETCDIR%%/vendor_modules/augeas_core/README.md -%%ETCDIR%%/vendor_modules/augeas_core/REFERENCE.md -%%ETCDIR%%/vendor_modules/augeas_core/lib/puppet/feature/augeas.rb -%%ETCDIR%%/vendor_modules/augeas_core/lib/puppet/provider/augeas/augeas.rb -%%ETCDIR%%/vendor_modules/augeas_core/lib/puppet/type/augeas.rb -%%ETCDIR%%/vendor_modules/augeas_core/lib/puppet_x/augeas/util/parser.rb -%%ETCDIR%%/vendor_modules/augeas_core/locales/config.yaml -%%ETCDIR%%/vendor_modules/augeas_core/locales/ja/puppetlabs-augeas_core.po -%%ETCDIR%%/vendor_modules/augeas_core/locales/puppetlabs-augeas_core.pot -%%ETCDIR%%/vendor_modules/augeas_core/metadata.json -%%ETCDIR%%/vendor_modules/augeas_core/readmes/README_ja_JP.md -%%ETCDIR%%/vendor_modules/cron_core/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml -%%ETCDIR%%/vendor_modules/cron_core/.github/workflows/static_code_analysis.yaml -%%ETCDIR%%/vendor_modules/cron_core/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml -%%ETCDIR%%/vendor_modules/cron_core/.github/workflows/unit_tests_with_released_puppet_gem.yaml -%%ETCDIR%%/vendor_modules/cron_core/.puppet-lint.rc -%%ETCDIR%%/vendor_modules/cron_core/.sync.yml -%%ETCDIR%%/vendor_modules/cron_core/CHANGELOG.md -%%ETCDIR%%/vendor_modules/cron_core/CODEOWNERS -%%ETCDIR%%/vendor_modules/cron_core/LICENSE -%%ETCDIR%%/vendor_modules/cron_core/README.md -%%ETCDIR%%/vendor_modules/cron_core/REFERENCE.md -%%ETCDIR%%/vendor_modules/cron_core/data/common.yaml -%%ETCDIR%%/vendor_modules/cron_core/hiera.yaml -%%ETCDIR%%/vendor_modules/cron_core/lib/puppet/provider/cron/crontab.rb -%%ETCDIR%%/vendor_modules/cron_core/lib/puppet/provider/cron/filetype.rb -%%ETCDIR%%/vendor_modules/cron_core/lib/puppet/type/cron.rb -%%ETCDIR%%/vendor_modules/cron_core/locales/config.yaml -%%ETCDIR%%/vendor_modules/cron_core/locales/ja/puppetlabs-cron_core.po -%%ETCDIR%%/vendor_modules/cron_core/locales/puppetlabs-cron_core.pot -%%ETCDIR%%/vendor_modules/cron_core/metadata.json -%%ETCDIR%%/vendor_modules/cron_core/readmes/README_ja_JP.md -%%ETCDIR%%/vendor_modules/host_core/CHANGELOG.md -%%ETCDIR%%/vendor_modules/host_core/CODEOWNERS -%%ETCDIR%%/vendor_modules/host_core/Gemfile -%%ETCDIR%%/vendor_modules/host_core/LICENSE -%%ETCDIR%%/vendor_modules/host_core/README.md -%%ETCDIR%%/vendor_modules/host_core/REFERENCE.md -%%ETCDIR%%/vendor_modules/host_core/Rakefile -%%ETCDIR%%/vendor_modules/host_core/appveyor.yml -%%ETCDIR%%/vendor_modules/host_core/checksums.json -%%ETCDIR%%/vendor_modules/host_core/data/common.yaml -%%ETCDIR%%/vendor_modules/host_core/hiera.yaml -%%ETCDIR%%/vendor_modules/host_core/lib/puppet/provider/host/parsed.rb -%%ETCDIR%%/vendor_modules/host_core/lib/puppet/type/host.rb -%%ETCDIR%%/vendor_modules/host_core/locales/config.yaml -%%ETCDIR%%/vendor_modules/host_core/locales/ja/puppetlabs-host_core.po -%%ETCDIR%%/vendor_modules/host_core/locales/puppetlabs-host_core.pot -%%ETCDIR%%/vendor_modules/host_core/metadata.json -%%ETCDIR%%/vendor_modules/host_core/readmes/README_ja_JP.md -%%ETCDIR%%/vendor_modules/host_core/spec/acceptance/nodesets/default.yml -%%ETCDIR%%/vendor_modules/host_core/spec/acceptance/tests/create_spec.rb -%%ETCDIR%%/vendor_modules/host_core/spec/acceptance/tests/destroy_spec.rb *** 799 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306011856.351IulFQ046694>