Attachment 179624 Details for Bug 216807 – Patch for 4.9.1 update and specify new localdir

[patch] Patch for 4.9.1 update and specify new localdir

puppet4.diff (text/plain), 3.07 KB, created by Zach Leslie on 2017-02-05 05:21:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zach Leslie

Created: 2017-02-05 05:21:45 UTC

Size: 3.07 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433350)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	puppet
>-PORTVERSION=	4.8.2
>+PORTVERSION=	4.9.1
> CATEGORIES=	sysutils
> MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
> PKGNAMESUFFIX=	4
>@@ -75,7 +75,7 @@
> 		${WRKSRC}/ext/rack/config.ru
> 
> do-install:
>-	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR}
>+	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} --localedir=/var/puppet/share/locales
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests
>Index: distinfo
>===================================================================
>--- distinfo	(revision 433350)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1485549930
>-SHA256 (puppet-4.8.2.tar.gz) = fc71ca0be64b4b1282e0064b8fbf115c547cb87ca6b209da56e1b9569567404a
>-SIZE (puppet-4.8.2.tar.gz) = 2873651
>+TIMESTAMP = 1486269327
>+SHA256 (puppet-4.9.1.tar.gz) = db02cffb8339b349bd1ab2b15899511d3f5d449f0f591038256f0fb862f4c7db
>+SIZE (puppet-4.9.1.tar.gz) = 2912770
>Index: files/patch-lib_puppet.rb
>===================================================================
>--- files/patch-lib_puppet.rb	(nonexistent)
>+++ files/patch-lib_puppet.rb	(working copy)
>@@ -0,0 +1,21 @@
>+--- lib/puppet.rb.orig	2017-02-04 20:55:19.503801289 -0800
>++++ lib/puppet.rb	2017-02-04 20:58:54.650300411 -0800
>+@@ -53,6 +53,7 @@
>+ 
>+   class << self
>+     if Puppet::GETTEXT_AVAILABLE
>++      freebsd_locale_path = '/var/puppet/share/locales'
>+       # e.g. ~/code/puppet/locales. Also when running as a gem.
>+       local_locale_path = File.absolute_path('../locales', File.dirname(__FILE__))
>+       # e.g. /opt/puppetlabs/puppet/share/locale
>+@@ -60,7 +61,9 @@
>+       # e.g. C:\Program Files\Puppet Labs\Puppet\puppet\share\locale
>+       win32_system_locale_path = File.absolute_path('../../../../../puppet/share/locale', File.dirname(__FILE__))
>+ 
>+-      if File.exist?(local_locale_path)
>++      if File.exist?(freebsd_locale_path)
>++        locale_path = freebsd_locale_path
>++      elsif File.exist?(local_locale_path)
>+         locale_path = local_locale_path
>+       elsif File.exist?(win32_system_locale_path)
>+         locale_path = win32_system_locale_path
>
>Property changes on: files/patch-lib_puppet.rb
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 433350)
>+++ pkg-plist	(working copy)
>@@ -42,5 +42,7 @@
> @dir(puppet,puppet,) %%ETCDIR%%/manifests
> @dir(puppet,puppet,) %%ETCDIR%%/modules
> @dir(puppet,puppet,) /var/puppet
>+@dir(puppet,puppet,) /var/puppet/share/locales
>+@dir(puppet,puppet,) /var/puppet/share
> @dir(puppet,puppet,) /var/log/puppet
> @dir /var/run/puppet

Actions: View | Diff

Attachments on bug 216807: 179624 | 181080 | 181124