svn commit: r480787 - in head/sysutils: . puppetserver puppetserver5 puppetserver6 puppetserver6/files
Romain Tartière
romain at FreeBSD.org
Thu Sep 27 07:59:14 UTC 2018
Author: romain
Date: Thu Sep 27 07:59:11 2018
New Revision: 480787
URL: https://svnweb.freebsd.org/changeset/ports/480787
Log:
New port: sysutils/puppetserver6
Release notes:
https://puppet.com/docs/puppetserver/6.0/release_notes.html
With hat: puppet
Added:
head/sysutils/puppetserver6/
- copied from r480786, head/sysutils/puppetserver5/
Modified:
head/sysutils/Makefile
head/sysutils/puppetserver/Makefile
head/sysutils/puppetserver5/Makefile
head/sysutils/puppetserver6/Makefile
head/sysutils/puppetserver6/distinfo
head/sysutils/puppetserver6/files/patch-ext__cli_defaults__cli-defaults.sh
head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf
head/sysutils/puppetserver6/files/pkg-message.in
head/sysutils/puppetserver6/files/puppetserver.in
head/sysutils/puppetserver6/pkg-plist
Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile Thu Sep 27 07:44:48 2018 (r480786)
+++ head/sysutils/Makefile Thu Sep 27 07:59:11 2018 (r480787)
@@ -958,6 +958,7 @@
SUBDIR += puppet6
SUBDIR += puppetserver
SUBDIR += puppetserver5
+ SUBDIR += puppetserver6
SUBDIR += pv
SUBDIR += pwd_unmkdb
SUBDIR += pwgen
Modified: head/sysutils/puppetserver/Makefile
==============================================================================
--- head/sysutils/puppetserver/Makefile Thu Sep 27 07:44:48 2018 (r480786)
+++ head/sysutils/puppetserver/Makefile Thu Sep 27 07:59:11 2018 (r480787)
@@ -23,6 +23,8 @@ NO_ARCH= yes
NO_BUILD= yes
JAVA_VERSION= 1.7+
+CONFLICTS_INSTALL= puppetserver5-* puppetserver6-*
+
USERS= puppet
GROUPS= puppet
Modified: head/sysutils/puppetserver5/Makefile
==============================================================================
--- head/sysutils/puppetserver5/Makefile Thu Sep 27 07:44:48 2018 (r480786)
+++ head/sysutils/puppetserver5/Makefile Thu Sep 27 07:59:11 2018 (r480787)
@@ -24,6 +24,8 @@ NO_ARCH= yes
NO_BUILD= yes
JAVA_VERSION= 1.8+
+CONFLICTS_INSTALL= puppetserver-* puppetserver6-*
+
SHEBANG_FILES= ext/bin/puppetserver
USERS= puppet
Modified: head/sysutils/puppetserver6/Makefile
==============================================================================
--- head/sysutils/puppetserver5/Makefile Thu Sep 27 07:44:48 2018 (r480786)
+++ head/sysutils/puppetserver6/Makefile Thu Sep 27 07:59:11 2018 (r480787)
@@ -1,10 +1,10 @@
# $FreeBSD$
PORTNAME= puppetserver
-PORTVERSION= 5.3.5
+PORTVERSION= 6.0.0
CATEGORIES= sysutils java
MASTER_SITES= https://downloads.puppetlabs.com/puppet/
-PKGNAMESUFFIX= 5
+PKGNAMESUFFIX= 6
MAINTAINER= puppet at FreeBSD.org
COMMENT= Puppet Server running in the JVM
@@ -12,8 +12,10 @@ COMMENT= Puppet Server running in the JVM
LICENSE= APACHE20
RUN_DEPENDS= bash>=0:shells/bash \
- puppet5>=0:sysutils/puppet5
-BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake
+ jruby>=9.1:lang/jruby \
+ puppet6>=0:sysutils/puppet6 \
+ rubygem-puppetserver-ca>=1:sysutils/rubygem-puppetserver-ca \
+ rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet
USES= shebangfix
USE_RC_SUBR= puppetserver
@@ -24,6 +26,8 @@ NO_ARCH= yes
NO_BUILD= yes
JAVA_VERSION= 1.8+
+CONFLICTS_INSTALL= puppetserver-* puppetserver5-*
+
SHEBANG_FILES= ext/bin/puppetserver
USERS= puppet
@@ -32,19 +36,6 @@ GROUPS= puppet
SUB_LIST= JAVA_HOME=${JAVA_HOME}
SUB_FILES= pkg-message
-OPTIONS_DEFAULT= CFACTER
-OPTIONS_RADIO= FACTER
-OPTIONS_RADIO_FACTER= CFACTER RFACTER
-
-RFACTER_DESC= Use facter 2.x (written in Ruby)
-CFACTER_DESC= Use facter 3.x (experimental rewrite in C++)
-
-RFACTER_BUILD_DEPENDS= rubygem-facter>=2.0:sysutils/rubygem-facter
-RFACTER_RUN_DEPENDS= rubygem-facter>=2.0:sysutils/rubygem-facter
-
-CFACTER_BUILD_DEPENDS= facter>=3.0:sysutils/facter
-CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter
-
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 \
@@ -60,6 +51,8 @@ post-patch:
-e 's|%%DATADIR%%|${DATADIR}|' \
${WRKSRC}/${file}
.endfor
+ @${REINPLACE_CMD} -e 's|#!/opt/puppetlabs/puppet/bin/ruby|#!${RUBY}|' \
+ ${WRKSRC}/ext/cli/ca
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps
@@ -69,7 +62,6 @@ do-install:
@${MKDIR} ${STAGEDIR}/var/log/puppetserver
@${MKDIR} ${STAGEDIR}/var/puppet/server
${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar
- ${INSTALL_DATA} ${WRKSRC}/jruby-9k.jar ${STAGEDIR}${DATADIR}/jruby-9k.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
@@ -82,6 +74,7 @@ do-install:
${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
Modified: head/sysutils/puppetserver6/distinfo
==============================================================================
--- head/sysutils/puppetserver5/distinfo Thu Sep 27 07:44:48 2018 (r480786)
+++ head/sysutils/puppetserver6/distinfo Thu Sep 27 07:59:11 2018 (r480787)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535015241
-SHA256 (puppetserver-5.3.5.tar.gz) = 27a299450e849abec6a4efea64cc571f041fe57c3f5692765f58acd66f8ff625
-SIZE (puppetserver-5.3.5.tar.gz) = 67238513
+TIMESTAMP = 1537339196
+SHA256 (puppetserver-6.0.0.tar.gz) = 5e289538d25d78856e72ac65b8f89334aff43ae9c290e4ed5052873c0749a2d7
+SIZE (puppetserver-6.0.0.tar.gz) = 62345355
Modified: head/sysutils/puppetserver6/files/patch-ext__cli_defaults__cli-defaults.sh
==============================================================================
--- head/sysutils/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh Thu Sep 27 07:44:48 2018 (r480786)
+++ head/sysutils/puppetserver6/files/patch-ext__cli_defaults__cli-defaults.sh Thu Sep 27 07:59:11 2018 (r480787)
@@ -1,11 +1,8 @@
--- ext/cli_defaults/cli-defaults.sh.orig 2017-08-06 01:24:37.981353156 -0700
+++ ext/cli_defaults/cli-defaults.sh 2017-08-06 01:39:53.280636611 -0700
-@@ -1,6 +1,6 @@
+@@ -1,4 +1,4 @@
-INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver"
+INSTALL_DIR="%%DATADIR%%"
--JRUBY_JAR="${JRUBY_JAR:-${INSTALL_DIR}/jruby-1_7.jar}"
-+JRUBY_JAR="${JRUBY_JAR:-${INSTALL_DIR}/jruby-9k.jar}"
-
- if [ ! -e "$JRUBY_JAR" ]; then
- echo "Unable to find specified JRUBY_JAR: ${JRUBY_JAR}" 1>&2
+ if [ -n "$JRUBY_JAR" ]; then
+ echo "Warning: the JRUBY_JAR setting is no longer needed and will be ignored." 1>&2
Modified: head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf
==============================================================================
--- head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf Thu Sep 27 07:44:48 2018 (r480786)
+++ head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf Thu Sep 27 07:59:11 2018 (r480787)
@@ -8,7 +8,7 @@
+ ruby-load-path: [
+ %%RUBY_SITELIBDIR%%,
+ %%PREFIX%%/lib/ruby/vendor_ruby,
-+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.5.0/lib,
++ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/semantic_puppet-1.0.2/lib,
+ ]
# This setting determines where JRuby will install gems. It is used for loading gems,
Modified: head/sysutils/puppetserver6/files/pkg-message.in
==============================================================================
--- head/sysutils/puppetserver5/files/pkg-message.in Thu Sep 27 07:44:48 2018 (r480786)
+++ head/sysutils/puppetserver6/files/pkg-message.in Thu Sep 27 07:59:11 2018 (r480787)
@@ -9,4 +9,3 @@ https://docs.puppet.com/puppetserver/latest/release_no
The file bootstrap.cfg has been removed and ca configuration has been moved out
to its own file in ca.cfg.
-
Modified: head/sysutils/puppetserver6/files/puppetserver.in
==============================================================================
--- head/sysutils/puppetserver5/files/puppetserver.in Thu Sep 27 07:44:48 2018 (r480786)
+++ head/sysutils/puppetserver6/files/puppetserver.in Thu Sep 27 07:59:11 2018 (r480787)
@@ -55,7 +55,7 @@ pidfile="/var/run/puppetserver/puppetserver.pid"
command="/usr/sbin/daemon"
java_cmd="${puppetserver_java_home}/bin/java"
procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
+command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
required_files="${java_cmd}"
Modified: head/sysutils/puppetserver6/pkg-plist
==============================================================================
--- head/sysutils/puppetserver5/pkg-plist Thu Sep 27 07:44:48 2018 (r480786)
+++ head/sysutils/puppetserver6/pkg-plist Thu Sep 27 07:59:11 2018 (r480787)
@@ -11,14 +11,14 @@
@sample %%ETCDIR%%/services.d/ca.cfg.sample
@dir(,puppet,750) etc/puppet/code
%%DATADIR%%/puppet-server-release.jar
-%%DATADIR%%/jruby-9k.jar
-@(,,755) %%DATADIR%%/cli/apps/start
-@(,,755) %%DATADIR%%/cli/apps/stop
-@(,,755) %%DATADIR%%/cli/apps/reload
+@(,,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
More information about the svn-ports-all
mailing list