mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-04 06:15:24 +00:00
Code Issues Releases Activity

Update to 4.10.6

Browse Source 
- Ensure an UTF-8 locale is used to avoid problems with facter;
- Ensure /usr/local/bin is in $PATH when puppet runs;
- Update conflicts (remove old ones and register a new one for the upcomming
  puppet5);

With hat:	puppet
This commit is contained in:
Romain Tartière 2017-08-12 13:35:40 +00:00
parent 0b39c99dba
commit f69f012a77
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=447830
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysutils/puppet4/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= puppet PORTNAME= puppet
PORTVERSION= 4.10.4 PORTVERSION= 4.10.6
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/ MASTER_SITES= http://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 4 PKGNAMESUFFIX= 4
@ -20,7 +20,7 @@ RUN_DEPENDS= rubygem-hiera>=2.0:sysutils/rubygem-hiera \
USES= cpe USES= cpe
CPE_VENDOR= puppetlabs CPE_VENDOR= puppetlabs
CONFLICTS_INSTALL= puppet38-* puppet37-* CONFLICTS_INSTALL= puppet5-*
NO_ARCH= yes NO_ARCH= yes
NO_BUILD= yes NO_BUILD= yes
USE_RUBY= yes USE_RUBY= yes
@ -75,7 +75,7 @@ post-patch:
${WRKSRC}/ext/rack/config.ru ${WRKSRC}/ext/rack/config.ru
do-install: do-install:
@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \
--localedir=/var/puppet/share/locales --localedir=/var/puppet/share/locales
post-install: post-install:
@ -83,7 +83,7 @@ post-install:
${MKDIR} ${STAGEDIR}${ETCDIR}/modules ${MKDIR} ${STAGEDIR}${ETCDIR}/modules
${MKDIR} ${STAGEDIR}/var/puppet ${MKDIR} ${STAGEDIR}/var/puppet
${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist
${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ ${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \
--confdir=${ETCDIR} \ --confdir=${ETCDIR} \
--rundir=/var/run/puppet \ --rundir=/var/run/puppet \
--vardir=/var/puppet \ --vardir=/var/puppet \

6
sysutils/puppet4/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1498495069 TIMESTAMP = 1502442267
SHA256 (puppet-4.10.4.tar.gz) = 59b8510ddf2f49342a39ccbe26bc7b2ea5e16d79de9dd572d929de58967aab90 SHA256 (puppet-4.10.6.tar.gz) = 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a
SIZE (puppet-4.10.4.tar.gz) = 2968202 SIZE (puppet-4.10.6.tar.gz) = 2977099

16
sysutils/puppet4/files/puppet.in
View File

@ -30,4 +30,20 @@ unset puppet_flags
pidfile="${puppet_rundir}/agent.pid" pidfile="${puppet_rundir}/agent.pid"
start_precmd="install -d -o puppet -g puppet ${pidfile%/*}" start_precmd="install -d -o puppet -g puppet ${pidfile%/*}"
PATH="${PATH}:/usr/local/bin"
# 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" run_rc_command "$1"