Attachment 217675 Details for Bug 249036 – The actual patch I would like to push as port of this update

[patch] The actual patch I would like to push as port of this update

facter.diff (text/plain), 3.44 KB, created by Romain Tartière on 2020-08-31 18:08:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Romain Tartière

Created: 2020-08-31 18:08:03 UTC

Size: 3.44 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 533228)
>+++ Makefile	(working copy)
>@@ -2,44 +2,25 @@
> # $FreeBSD$
> 
> PORTNAME=	facter
>-PORTVERSION=	2.5.1
>-PORTREVISION=	2
>+PORTVERSION=	4.0.35
> CATEGORIES=	sysutils rubygems
>-MASTER_SITES=	RG \
>-		http://downloads.puppetlabs.com/facter/
>+MASTER_SITES=	RG
> 
>-MAINTAINER=	robak@FreeBSD.org
>+MAINTAINER=	puppet@FreeBSD.org
> COMMENT=	Cross-platform Ruby library for retrieving facts from OS
> 
> LICENSE=	APACHE20
>-LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> USE_RUBY=	yes
> USES=		gem
> 
>+RUN_DEPENDS=	rubygem-hocon>=1.3:devel/rubygem-hocon \
>+		rubygem-thor>=1.0.1:devel/rubygem-thor
>+
> PLIST_FILES=	bin/facter ${GEMS_DIR}/facter
> 
>-OPTIONS_DEFINE=	EC2_FACTS ZFS_FACTS
>-EC2_FACTS_DESC=	Generate AWS EC2 related facts
>-ZFS_FACTS_DESC=	Generate ZFS related facts
>-
>-OPTIONS_DEFAULT=	EC2_FACTS ZFS_FACTS
>-
> .include <bsd.port.pre.mk>
> 
>-# Restrict dmidecode dependency to x86-based systems
>-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
>-RUN_DEPENDS+=	dmidecode:sysutils/dmidecode
>-.endif
>-
>-post-patch-EC2_FACTS-off:
>-	@${REINPLACE_CMD} -e 's/\,\ \"lib\/facter\/ec2.rb\"//' ${WRKSRC}/${PORTNAME}.gemspec
>-	@${REINPLACE_CMD} -e 's/\,\ \"lib\/facter\/ec2\/rest.rb\"//' ${WRKSRC}/${PORTNAME}.gemspec
>-
>-post-patch-ZFS_FACTS-off:
>-	@${REINPLACE_CMD} -e 's/\,\ \"lib\/facter\/zfs_version.rb\"//' ${WRKSRC}/${PORTNAME}.gemspec
>-	@${REINPLACE_CMD} -e 's/\,\ \"lib\/facter\/zpool_version.rb\"//' ${WRKSRC}/${PORTNAME}.gemspec
>-
> post-install:
> 	${RLN} ${STAGEDIR}/${PREFIX}/${GEMS_DIR}/facter-${PORTVERSION} ${STAGEDIR}/${PREFIX}/${GEMS_DIR}/facter
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 533228)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1508036681
>-SHA256 (rubygem/facter-2.5.1.gem) = 6108a6178ee727088915984d161c2006e5bf991134fd37f29417ec5fbdfee51c
>-SIZE (rubygem/facter-2.5.1.gem) = 254464
>+TIMESTAMP = 1598484920
>+SHA256 (rubygem/facter-4.0.35.gem) = 229749ba7151278d7bf980e032497c03e316d1073e9f58be56ec82977cfa04ca
>+SIZE (rubygem/facter-4.0.35.gem) = 124416
>Index: files/patch-lib_facter_custom__facts_util_config.rb
>===================================================================
>--- files/patch-lib_facter_custom__facts_util_config.rb	(nonexistent)
>+++ files/patch-lib_facter_custom__facts_util_config.rb	(working copy)
>@@ -0,0 +1,10 @@
>+--- lib/facter/custom_facts/util/config.rb.orig	2020-08-31 03:41:56 UTC
>++++ lib/facter/custom_facts/util/config.rb
>+@@ -43,6 +43,7 @@ module LegacyFacter
>+                                                      [File.join(windows_dir, 'PuppetLabs', 'facter', 'facts.d')]
>+                                                    else
>+                                                      [
>++                                                       '/usr/local/etc/facter/facts.d/',
>+                                                        '/etc/puppetlabs/facter/facts.d',
>+                                                        '/etc/facter/facts.d/',
>+                                                        '/opt/puppetlabs/facter/facts.d'
>
>Property changes on: files/patch-lib_facter_custom__facts_util_config.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

Actions: View | Diff

Attachments on bug 249036: 217675