[arch-commits] Commit in facter/repos (6 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Dec 29 00:56:33 UTC 2015
Date: Tuesday, December 29, 2015 @ 01:56:32
Author: foutrelis
Revision: 154773
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
facter/repos/community-staging-i686/PKGBUILD
(from rev 154772, facter/trunk/PKGBUILD)
facter/repos/community-staging-i686/ruby23.patch
(from rev 154772, facter/trunk/ruby23.patch)
facter/repos/community-staging-x86_64/PKGBUILD
(from rev 154772, facter/trunk/PKGBUILD)
facter/repos/community-staging-x86_64/ruby23.patch
(from rev 154772, facter/trunk/ruby23.patch)
Deleted:
facter/repos/community-staging-i686/PKGBUILD
facter/repos/community-staging-x86_64/PKGBUILD
---------------------------------------+
/PKGBUILD | 108 ++++++++++++++++++++++++++++++++
community-staging-i686/PKGBUILD | 37 ----------
community-staging-i686/ruby23.patch | 90 ++++++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 37 ----------
community-staging-x86_64/ruby23.patch | 90 ++++++++++++++++++++++++++
5 files changed, 288 insertions(+), 74 deletions(-)
Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD 2015-12-29 00:56:24 UTC (rev 154772)
+++ community-staging-i686/PKGBUILD 2015-12-29 00:56:32 UTC (rev 154773)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Greg Sutcliffe <facter_aur (at) emeraldreverie.orgr>
-# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux at free.fr>
-# Contributor: Thomas S Hatch <thatch45 (at) Gmail.com>
-# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com>
-# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
-
-pkgname=facter
-pkgver=3.1.3
-pkgrel=5
-pkgdesc="Collect and display system facts"
-arch=('i686' 'x86_64')
-url="http://puppetlabs.com/facter"
-license=('APACHE')
-depends=('ruby' 'yaml-cpp' 'boost-libs' 'curl')
-makedepends=('boost' 'cmake' 'java-environment')
-optdepends=('java-environment: jruby support')
-replaces=('cfacter')
-source=(http://downloads.puppetlabs.com/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('0a07f8f88ac8c1f2ed7566a51dc775bc')
-
-build() {
- cd $pkgname-$pkgver
-
- JAVA_HOME=/usr/lib/jvm/default cmake -DCMAKE_INSTALL_PREFIX=/usr
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make install DESTDIR="$pkgdir"
-
- install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: facter/repos/community-staging-i686/PKGBUILD (from rev 154772, facter/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-29 00:56:32 UTC (rev 154773)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Greg Sutcliffe <facter_aur (at) emeraldreverie.orgr>
+# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux at free.fr>
+# Contributor: Thomas S Hatch <thatch45 (at) Gmail.com>
+# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com>
+# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
+
+pkgname=facter
+pkgver=3.1.3
+pkgrel=6
+pkgdesc="Collect and display system facts"
+arch=('i686' 'x86_64')
+url="http://puppetlabs.com/facter"
+license=('APACHE')
+depends=('ruby' 'yaml-cpp' 'boost-libs' 'curl')
+makedepends=('boost' 'cmake' 'java-environment')
+optdepends=('java-environment: jruby support')
+replaces=('cfacter')
+source=(http://downloads.puppetlabs.com/$pkgname/$pkgname-$pkgver.tar.gz
+ ruby23.patch)
+md5sums=('0a07f8f88ac8c1f2ed7566a51dc775bc'
+ 'cae82c863a8efe27688b7ef6fc66bc6f')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Replace rb_data_object_alloc symbol with rb_data_object_wrap
+ # https://tickets.puppetlabs.com/browse/FACT-1291
+ patch -Np1 -i ../ruby23.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ JAVA_HOME=/usr/lib/jvm/default cmake -DCMAKE_INSTALL_PREFIX=/usr
+
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+
+ # TODO: Investigate why tests fail on i686 most of the time with Ruby 2.3.0
+ make test || [[ $CARCH == i686 ]]
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make install DESTDIR="$pkgdir"
+
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Copied: facter/repos/community-staging-i686/ruby23.patch (from rev 154772, facter/trunk/ruby23.patch)
===================================================================
--- community-staging-i686/ruby23.patch (rev 0)
+++ community-staging-i686/ruby23.patch 2015-12-29 00:56:32 UTC (rev 154773)
@@ -0,0 +1,90 @@
+diff -uprb facter-3.1.3.orig/lib/src/ruby/aggregate_resolution.cc facter-3.1.3/lib/src/ruby/aggregate_resolution.cc
+--- facter-3.1.3.orig/lib/src/ruby/aggregate_resolution.cc 2015-11-25 02:13:58.000000000 +0200
++++ facter-3.1.3/lib/src/ruby/aggregate_resolution.cc 2015-12-29 02:03:30.735361627 +0200
+@@ -138,7 +138,7 @@ namespace facter { namespace ruby {
+
+ // Create a resolution and wrap with a Ruby data object
+ unique_ptr<aggregate_resolution> r(new aggregate_resolution());
+- VALUE self = r->_self = ruby.rb_data_object_alloc(klass, r.get(), mark, free);
++ VALUE self = r->_self = ruby.rb_data_object_wrap(klass, r.get(), mark, free);
+ ruby.register_data_object(self);
+
+ // Release the smart pointer; ownership is now with Ruby's GC
+diff -uprb facter-3.1.3.orig/lib/src/ruby/fact.cc facter-3.1.3/lib/src/ruby/fact.cc
+--- facter-3.1.3.orig/lib/src/ruby/fact.cc 2015-11-25 02:13:58.000000000 +0200
++++ facter-3.1.3/lib/src/ruby/fact.cc 2015-12-29 02:03:30.738695043 +0200
+@@ -285,7 +285,7 @@ namespace facter { namespace ruby {
+
+ // Create a fact and wrap with a Ruby data object
+ unique_ptr<fact> f(new fact());
+- VALUE self = f->_self = ruby.rb_data_object_alloc(klass, f.get(), mark, free);
++ VALUE self = f->_self = ruby.rb_data_object_wrap(klass, f.get(), mark, free);
+ ruby.register_data_object(self);
+
+ // Release the smart pointer; ownership is now with Ruby's GC
+diff -uprb facter-3.1.3.orig/lib/src/ruby/module.cc facter-3.1.3/lib/src/ruby/module.cc
+--- facter-3.1.3.orig/lib/src/ruby/module.cc 2015-11-25 02:13:58.000000000 +0200
++++ facter-3.1.3/lib/src/ruby/module.cc 2015-12-29 02:03:30.738695043 +0200
+@@ -50,7 +50,7 @@ namespace facter { namespace ruby {
+ // The easiest way to get notified is to have a global data object that never gets collected
+ // until the VM shuts down
+ auto const& ruby = api::instance();
+- _canary = ruby.rb_data_object_alloc(*ruby.rb_cObject, this, nullptr, cleanup);
++ _canary = ruby.rb_data_object_wrap(*ruby.rb_cObject, this, nullptr, cleanup);
+ ruby.rb_gc_register_address(&_canary);
+ ruby.register_data_object(_canary);
+ }
+diff -uprb facter-3.1.3.orig/lib/src/ruby/simple_resolution.cc facter-3.1.3/lib/src/ruby/simple_resolution.cc
+--- facter-3.1.3.orig/lib/src/ruby/simple_resolution.cc 2015-11-25 02:13:58.000000000 +0200
++++ facter-3.1.3/lib/src/ruby/simple_resolution.cc 2015-12-29 02:03:30.738695043 +0200
+@@ -74,7 +74,7 @@ namespace facter { namespace ruby {
+
+ // Create a resolution and wrap with a Ruby data object
+ unique_ptr<simple_resolution> r(new simple_resolution());
+- VALUE self = r->_self = ruby.rb_data_object_alloc(klass, r.get(), mark, free);
++ VALUE self = r->_self = ruby.rb_data_object_wrap(klass, r.get(), mark, free);
+ ruby.register_data_object(self);
+
+ // Release the smart pointer; ownership is now with Ruby's GC
+diff -uprb facter-3.1.3.orig/vendor/leatherman/ruby/inc/leatherman/ruby/api.hpp facter-3.1.3/vendor/leatherman/ruby/inc/leatherman/ruby/api.hpp
+--- facter-3.1.3.orig/vendor/leatherman/ruby/inc/leatherman/ruby/api.hpp 2015-11-25 02:14:00.000000000 +0200
++++ facter-3.1.3/vendor/leatherman/ruby/inc/leatherman/ruby/api.hpp 2015-12-29 02:03:30.738695043 +0200
+@@ -341,7 +341,7 @@ namespace leatherman { namespace ruby {
+ /**
+ * See MRI documentation.
+ */
+- VALUE (* const rb_data_object_alloc)(VALUE, void*, RUBY_DATA_FUNC, RUBY_DATA_FUNC);
++ VALUE (* const rb_data_object_wrap)(VALUE, void*, RUBY_DATA_FUNC, RUBY_DATA_FUNC);
+ /**
+ * See MRI documentation.
+ */
+@@ -621,7 +621,7 @@ namespace leatherman { namespace ruby {
+
+ /**
+ * Gets the underlying native instance from a Ruby data object.
+- * The Ruby object must have been allocated with rb_data_object_alloc.
++ * The Ruby object must have been allocated with rb_data_object_wrap.
+ * @tparam T The underlying native type.
+ * @param obj The Ruby data object to get the native instance for.
+ * @return Returns a pointer to the underlying native type.
+@@ -634,7 +634,7 @@ namespace leatherman { namespace ruby {
+
+ /**
+ * Registers a data object for cleanup when the API is destructed.
+- * The object must have been created with rb_data_object_alloc.
++ * The object must have been created with rb_data_object_wrap.
+ * @param obj The data object to register.
+ */
+ void register_data_object(VALUE obj) const
+diff -uprb facter-3.1.3.orig/vendor/leatherman/ruby/src/api.cc facter-3.1.3/vendor/leatherman/ruby/src/api.cc
+--- facter-3.1.3.orig/vendor/leatherman/ruby/src/api.cc 2015-11-25 02:14:00.000000000 +0200
++++ facter-3.1.3/vendor/leatherman/ruby/src/api.cc 2015-12-29 02:03:30.738695043 +0200
+@@ -80,7 +80,7 @@ namespace leatherman { namespace ruby {
+ LOAD_SYMBOL(rb_to_id),
+ LOAD_SYMBOL(rb_id2name),
+ LOAD_SYMBOL(rb_define_alloc_func),
+- LOAD_SYMBOL(rb_data_object_alloc),
++ LOAD_SYMBOL(rb_data_object_wrap),
+ LOAD_SYMBOL(rb_gc_mark),
+ LOAD_SYMBOL(rb_yield_values),
+ LOAD_SYMBOL(rb_require),
Deleted: community-staging-x86_64/PKGBUILD
===================================================================
--- community-staging-x86_64/PKGBUILD 2015-12-29 00:56:24 UTC (rev 154772)
+++ community-staging-x86_64/PKGBUILD 2015-12-29 00:56:32 UTC (rev 154773)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Greg Sutcliffe <facter_aur (at) emeraldreverie.orgr>
-# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux at free.fr>
-# Contributor: Thomas S Hatch <thatch45 (at) Gmail.com>
-# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com>
-# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
-
-pkgname=facter
-pkgver=3.1.3
-pkgrel=5
-pkgdesc="Collect and display system facts"
-arch=('i686' 'x86_64')
-url="http://puppetlabs.com/facter"
-license=('APACHE')
-depends=('ruby' 'yaml-cpp' 'boost-libs' 'curl')
-makedepends=('boost' 'cmake' 'java-environment')
-optdepends=('java-environment: jruby support')
-replaces=('cfacter')
-source=(http://downloads.puppetlabs.com/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('0a07f8f88ac8c1f2ed7566a51dc775bc')
-
-build() {
- cd $pkgname-$pkgver
-
- JAVA_HOME=/usr/lib/jvm/default cmake -DCMAKE_INSTALL_PREFIX=/usr
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make install DESTDIR="$pkgdir"
-
- install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: facter/repos/community-staging-x86_64/PKGBUILD (from rev 154772, facter/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-12-29 00:56:32 UTC (rev 154773)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Greg Sutcliffe <facter_aur (at) emeraldreverie.orgr>
+# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux at free.fr>
+# Contributor: Thomas S Hatch <thatch45 (at) Gmail.com>
+# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com>
+# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
+
+pkgname=facter
+pkgver=3.1.3
+pkgrel=6
+pkgdesc="Collect and display system facts"
+arch=('i686' 'x86_64')
+url="http://puppetlabs.com/facter"
+license=('APACHE')
+depends=('ruby' 'yaml-cpp' 'boost-libs' 'curl')
+makedepends=('boost' 'cmake' 'java-environment')
+optdepends=('java-environment: jruby support')
+replaces=('cfacter')
+source=(http://downloads.puppetlabs.com/$pkgname/$pkgname-$pkgver.tar.gz
+ ruby23.patch)
+md5sums=('0a07f8f88ac8c1f2ed7566a51dc775bc'
+ 'cae82c863a8efe27688b7ef6fc66bc6f')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Replace rb_data_object_alloc symbol with rb_data_object_wrap
+ # https://tickets.puppetlabs.com/browse/FACT-1291
+ patch -Np1 -i ../ruby23.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ JAVA_HOME=/usr/lib/jvm/default cmake -DCMAKE_INSTALL_PREFIX=/usr
+
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+
+ # TODO: Investigate why tests fail on i686 most of the time with Ruby 2.3.0
+ make test || [[ $CARCH == i686 ]]
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make install DESTDIR="$pkgdir"
+
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Copied: facter/repos/community-staging-x86_64/ruby23.patch (from rev 154772, facter/trunk/ruby23.patch)
===================================================================
--- community-staging-x86_64/ruby23.patch (rev 0)
+++ community-staging-x86_64/ruby23.patch 2015-12-29 00:56:32 UTC (rev 154773)
@@ -0,0 +1,90 @@
+diff -uprb facter-3.1.3.orig/lib/src/ruby/aggregate_resolution.cc facter-3.1.3/lib/src/ruby/aggregate_resolution.cc
+--- facter-3.1.3.orig/lib/src/ruby/aggregate_resolution.cc 2015-11-25 02:13:58.000000000 +0200
++++ facter-3.1.3/lib/src/ruby/aggregate_resolution.cc 2015-12-29 02:03:30.735361627 +0200
+@@ -138,7 +138,7 @@ namespace facter { namespace ruby {
+
+ // Create a resolution and wrap with a Ruby data object
+ unique_ptr<aggregate_resolution> r(new aggregate_resolution());
+- VALUE self = r->_self = ruby.rb_data_object_alloc(klass, r.get(), mark, free);
++ VALUE self = r->_self = ruby.rb_data_object_wrap(klass, r.get(), mark, free);
+ ruby.register_data_object(self);
+
+ // Release the smart pointer; ownership is now with Ruby's GC
+diff -uprb facter-3.1.3.orig/lib/src/ruby/fact.cc facter-3.1.3/lib/src/ruby/fact.cc
+--- facter-3.1.3.orig/lib/src/ruby/fact.cc 2015-11-25 02:13:58.000000000 +0200
++++ facter-3.1.3/lib/src/ruby/fact.cc 2015-12-29 02:03:30.738695043 +0200
+@@ -285,7 +285,7 @@ namespace facter { namespace ruby {
+
+ // Create a fact and wrap with a Ruby data object
+ unique_ptr<fact> f(new fact());
+- VALUE self = f->_self = ruby.rb_data_object_alloc(klass, f.get(), mark, free);
++ VALUE self = f->_self = ruby.rb_data_object_wrap(klass, f.get(), mark, free);
+ ruby.register_data_object(self);
+
+ // Release the smart pointer; ownership is now with Ruby's GC
+diff -uprb facter-3.1.3.orig/lib/src/ruby/module.cc facter-3.1.3/lib/src/ruby/module.cc
+--- facter-3.1.3.orig/lib/src/ruby/module.cc 2015-11-25 02:13:58.000000000 +0200
++++ facter-3.1.3/lib/src/ruby/module.cc 2015-12-29 02:03:30.738695043 +0200
+@@ -50,7 +50,7 @@ namespace facter { namespace ruby {
+ // The easiest way to get notified is to have a global data object that never gets collected
+ // until the VM shuts down
+ auto const& ruby = api::instance();
+- _canary = ruby.rb_data_object_alloc(*ruby.rb_cObject, this, nullptr, cleanup);
++ _canary = ruby.rb_data_object_wrap(*ruby.rb_cObject, this, nullptr, cleanup);
+ ruby.rb_gc_register_address(&_canary);
+ ruby.register_data_object(_canary);
+ }
+diff -uprb facter-3.1.3.orig/lib/src/ruby/simple_resolution.cc facter-3.1.3/lib/src/ruby/simple_resolution.cc
+--- facter-3.1.3.orig/lib/src/ruby/simple_resolution.cc 2015-11-25 02:13:58.000000000 +0200
++++ facter-3.1.3/lib/src/ruby/simple_resolution.cc 2015-12-29 02:03:30.738695043 +0200
+@@ -74,7 +74,7 @@ namespace facter { namespace ruby {
+
+ // Create a resolution and wrap with a Ruby data object
+ unique_ptr<simple_resolution> r(new simple_resolution());
+- VALUE self = r->_self = ruby.rb_data_object_alloc(klass, r.get(), mark, free);
++ VALUE self = r->_self = ruby.rb_data_object_wrap(klass, r.get(), mark, free);
+ ruby.register_data_object(self);
+
+ // Release the smart pointer; ownership is now with Ruby's GC
+diff -uprb facter-3.1.3.orig/vendor/leatherman/ruby/inc/leatherman/ruby/api.hpp facter-3.1.3/vendor/leatherman/ruby/inc/leatherman/ruby/api.hpp
+--- facter-3.1.3.orig/vendor/leatherman/ruby/inc/leatherman/ruby/api.hpp 2015-11-25 02:14:00.000000000 +0200
++++ facter-3.1.3/vendor/leatherman/ruby/inc/leatherman/ruby/api.hpp 2015-12-29 02:03:30.738695043 +0200
+@@ -341,7 +341,7 @@ namespace leatherman { namespace ruby {
+ /**
+ * See MRI documentation.
+ */
+- VALUE (* const rb_data_object_alloc)(VALUE, void*, RUBY_DATA_FUNC, RUBY_DATA_FUNC);
++ VALUE (* const rb_data_object_wrap)(VALUE, void*, RUBY_DATA_FUNC, RUBY_DATA_FUNC);
+ /**
+ * See MRI documentation.
+ */
+@@ -621,7 +621,7 @@ namespace leatherman { namespace ruby {
+
+ /**
+ * Gets the underlying native instance from a Ruby data object.
+- * The Ruby object must have been allocated with rb_data_object_alloc.
++ * The Ruby object must have been allocated with rb_data_object_wrap.
+ * @tparam T The underlying native type.
+ * @param obj The Ruby data object to get the native instance for.
+ * @return Returns a pointer to the underlying native type.
+@@ -634,7 +634,7 @@ namespace leatherman { namespace ruby {
+
+ /**
+ * Registers a data object for cleanup when the API is destructed.
+- * The object must have been created with rb_data_object_alloc.
++ * The object must have been created with rb_data_object_wrap.
+ * @param obj The data object to register.
+ */
+ void register_data_object(VALUE obj) const
+diff -uprb facter-3.1.3.orig/vendor/leatherman/ruby/src/api.cc facter-3.1.3/vendor/leatherman/ruby/src/api.cc
+--- facter-3.1.3.orig/vendor/leatherman/ruby/src/api.cc 2015-11-25 02:14:00.000000000 +0200
++++ facter-3.1.3/vendor/leatherman/ruby/src/api.cc 2015-12-29 02:03:30.738695043 +0200
+@@ -80,7 +80,7 @@ namespace leatherman { namespace ruby {
+ LOAD_SYMBOL(rb_to_id),
+ LOAD_SYMBOL(rb_id2name),
+ LOAD_SYMBOL(rb_define_alloc_func),
+- LOAD_SYMBOL(rb_data_object_alloc),
++ LOAD_SYMBOL(rb_data_object_wrap),
+ LOAD_SYMBOL(rb_gc_mark),
+ LOAD_SYMBOL(rb_yield_values),
+ LOAD_SYMBOL(rb_require),
More information about the arch-commits
mailing list