Bug 199477 - [patch] sysutils/rubygem-facter: ZFS_FACTS patch doesn't work
Summary: [patch] sysutils/rubygem-facter: ZFS_FACTS patch doesn't work
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Bartek Rutkowski
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2015-04-16 01:53 UTC by Kan Sasaki
Modified: 2015-05-23 19:08 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (robak)


Attachments
patch for Makefile (617 bytes, patch)
2015-04-16 01:53 UTC, Kan Sasaki
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kan Sasaki 2015-04-16 01:53:01 UTC
Created attachment 155639 [details]
patch for Makefile

A patch for facter.gemspec doesn't apply properly because of format change.
Comment 1 Bartek Rutkowski freebsd_committer freebsd_triage 2015-04-16 11:05:47 UTC
Are you sure you're using the latest version of the port? I've just tested it on all supported OS versions and cant reproduce your issue. Please, verify your port svn revision is 383418 and that your ports tree and OS are up to date and supported (that is, 10.1, 9.3 or 8.4) and try to paste the logs showing the build issue.
Comment 2 Kan Sasaki 2015-04-16 12:51:24 UTC
My port svn revision is 383418, and OS version is 9.3-STABLE.

I've checked thoroughly, and I guess this is produced by r382631
change for Mk/bsd.ruby.mk. Old format is yaml, but new format is ruby.

svn log -r r382631 Mk/bsd.ruby.mk says the following:

------------------------------------------------------------------------
r382631 | swills | 2015-03-30 11:47:07 +0900 (Mon, 30 Mar 2015) | 5 lines

Update ruby-gems to 2.4.5

Note this is a big upgrade and the way gemspecs are generated changed. As a
result, all patched gemspecs had to have new patches.

------------------------------------------------------------------------

Is this same issue?
Comment 3 Bartek Rutkowski freebsd_committer freebsd_triage 2015-04-16 19:05:32 UTC
(In reply to Kan Sasaki from comment #2)
I've just updated my ports tree and I really cant see the issue on any of supported OS versions. Any chance you could do a fresh installation in some VM (VirtualBox or something like that) and see if you can reproduce it there?
Comment 4 Kan Sasaki 2015-04-17 01:23:16 UTC
I did a fresh installation in VirtualBox, and the result was same.

The procedures for installation are following:

1. Install from FreeBSD-9.3-RELEASE-amd64-disc1.iso
2. Run freebsd-update
3. Run svn checkout svn://svn0.us-west.FreeBSD.org/ports/head /usr/ports
4. Turn off ZFS_FACTS and install rubygem-facter

# uname -a
FreeBSD vm.noc.fcc.ad.jp 9.3-RELEASE-p13 FreeBSD 9.3-RELEASE-p13 #0: Tue Apr  7 03:01:12 UTC 2015     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64

# svn info
Path: .
Working Copy Root Path: /usr/ports
URL: svn://svn0.us-west.freebsd.org/ports/head
Relative URL: ^/head
Repository Root: svn://svn0.us-west.freebsd.org/ports
Repository UUID: 35697150-7ecd-e111-bb59-0022644237b5
Revision: 384133
Node Kind: directory
Schedule: normal
Last Changed Author: marino
Last Changed Rev: 384133
Last Changed Date: 2015-04-17 08:01:41 +0900 (Fri, 17 Apr 2015)

# cd /usr/ports/sysutils/rubygem-facter
# make config (turn off ZFS_FACTS)

# make showconfig
===> The following configuration options are available for rubygem-facter-2.4.3:
     ZFS_FACTS=off: Generate ZFS-related facts
===> Use 'make config' to modify these settings

# make install BATCH=yes

# pkg info rubygem-facter-2.4.3
rubygem-facter-2.4.3
Name           : rubygem-facter
Version        : 2.4.3
Installed on   : Fri Apr 17 10:01:26 JST 2015
Origin         : sysutils/rubygem-facter
Architecture   : freebsd:9:x86:64
Prefix         : /usr/local
Categories     : sysutils rubygems
Licenses       : APACHE20
Maintainer     : robak@FreeBSD.org
WWW            : https://puppetlabs.com/facter
Comment        : Cross-platform Ruby library for retrieving facts from OS
Options        :
        ZFS_FACTS      : off
Annotations    :
Flat size      : 3.72MiB
Description    :
A cross-platform Ruby library for retrieving facts from operating systems.
Supports multiple resolution mechanisms, any of which can be restricted to
working only on certain operating systems or environments. Facter is
especially useful for retrieving things like operating system names, IP
addresses, MAC addresses, and SSH keys.

WWW: https://puppetlabs.com/facter

# pkg info -l rubygem-facter-2.4.3 | egrep '(zfs|zpool)_version\.rb'
        /usr/local/lib/ruby/gems/2.1/gems/facter-2.4.3/lib/facter/zfs_version.rb
        /usr/local/lib/ruby/gems/2.1/gems/facter-2.4.3/lib/facter/zpool_version.rb

# ls -l /usr/local/lib/ruby/gems/2.1/gems/facter-2.4.3/lib/facter/zfs_version.rb /usr/local/lib/ruby/gems/2.1/gems/facter-2.4.3/lib/facter/zpool_version.rb
-rw-r--r--  1 root  wheel  450 Apr 17 10:01 /usr/local/lib/ruby/gems/2.1/gems/facter-2.4.3/lib/facter/zfs_version.rb
-rw-r--r--  1 root  wheel  276 Apr 17 10:01 /usr/local/lib/ruby/gems/2.1/gems/facter-2.4.3/lib/facter/zpool_version.rb

If I remove those two files from work/facter-2.4.3/facter.gemspec by
hand after running make patch, they will not be installed.
Comment 5 commit-hook freebsd_committer freebsd_triage 2015-05-23 19:05:39 UTC
A commit references this bug:

Author: mmoll
Date: Sat May 23 19:04:50 UTC 2015
New revision: 387181
URL: https://svnweb.freebsd.org/changeset/ports/387181

Log:
  sysutils/rubygem-facter: fix ZFS_FACTS option

  Adjust sed calls as r382631 changed the format of the generated file.

  PR:		199477
  Differential Revision:	https://reviews.freebsd.org/D2497
  Approved by:	mat (mentor), robak (maintainer, timeout)

Changes:
  head/sysutils/rubygem-facter/Makefile
Comment 6 Michael Moll freebsd_committer freebsd_triage 2015-05-23 19:08:14 UTC
Should be fixed now, please report back, if not. Thanks!