diff options
| author | Romain Tartière <romain@FreeBSD.org> | 2018-07-24 06:47:48 +0000 |
|---|---|---|
| committer | Romain Tartière <romain@FreeBSD.org> | 2018-07-24 06:47:48 +0000 |
| commit | 3cdd27d0c34d6b5b482fc9f12d2efb4189a5ddc7 (patch) | |
| tree | 601c4c239bba8d7e02db8b9727588a96cd4a1bb3 | |
| parent | - Exclude LibreSSL 2.6.5 from CVE-2018-0732 entry (diff) | |
Add a patch to search for configuration files under PREFIX, e.g.
/usr/local/etc/r10k/r10k.yaml
/usr/local/etc/r10k.yaml
While here, pass maintainership to puppet@
PR: 227341
Submitted by: romain
Approved by: swills (with ruby hat)
Notes
Notes:
svn path=/head/; revision=475227
| -rw-r--r-- | sysutils/rubygem-r10k/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb | 24 |
2 files changed, 30 insertions, 1 deletions
diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile index 556c4688be6e..f01115a8c171 100644 --- a/sysutils/rubygem-r10k/Makefile +++ b/sysutils/rubygem-r10k/Makefile @@ -2,10 +2,11 @@ PORTNAME= r10k PORTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= puppet@FreeBSD.org COMMENT= Tool for deploying Puppet environments and modules LICENSE= APACHE20 @@ -26,4 +27,8 @@ PLIST_FILES= bin/r10k SHEBANG_FILES= integration/*/*.sh +post-patch: + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ + ${WRKSRC}/lib/r10k/settings/loader.rb + .include <bsd.port.mk> diff --git a/sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb b/sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb new file mode 100644 index 000000000000..de6cdbd209a0 --- /dev/null +++ b/sysutils/rubygem-r10k/files/patch-lib_r10k_settings_loader.rb @@ -0,0 +1,24 @@ +--- lib/r10k/settings/loader.rb.orig 2018-04-07 11:13:36 UTC ++++ lib/r10k/settings/loader.rb +@@ -8,8 +8,8 @@ module R10K + # + # r10k.yaml is checked for in the following locations: + # - $PWD/r10k.yaml +- # - /etc/puppetlabs/r10k/r10k.yaml +- # - /etc/r10k.yaml ++ # - %%PREFIX%%/etc/r10k/r10k.yaml ++ # - %%PREFIX%%/etc/r10k.yaml + class Loader + + def self.search(override = nil) +@@ -21,8 +21,8 @@ module R10K + attr_reader :loadpath + + CONFIG_FILE = 'r10k.yaml' +- DEFAULT_LOCATION = File.join('/etc/puppetlabs/r10k', CONFIG_FILE) +- OLD_DEFAULT_LOCATION = File.join('/etc', CONFIG_FILE) ++ DEFAULT_LOCATION = File.join('%%PREFIX%%/etc/r10k', CONFIG_FILE) ++ OLD_DEFAULT_LOCATION = File.join('%%PREFIX%%/etc', CONFIG_FILE) + + def initialize + @loadpath = [] |