Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +1,2 @@
-ffi-ffi-b69a5e3.tar.gz
-/ffi-ffi-1.0.9-0-gb79eb61.tar.gz
+/ffi-*.gem
+/ffi-*-spec.txz

0001-Fix-issue-114-Structs-no-longer-support-bools.patch

@@ -1,121 +0,0 @@
-From 2e84385010cd544efb475672ba52d8e466e05332 Mon Sep 17 00:00:00 2001
-From: Wayne Meissner <wmeissner@gmail.com>
-Date: Sun, 29 May 2011 18:01:28 +1000
-Subject: [PATCH] Fix issue #114 (Structs no longer support bools).
-
-(cherry picked from commit 21d839cf5ff5f0920bd6818ff47ab95a0c2ee739)
-
-Add failing spec to for FFI::Struct :bool member
-
-(cherry picked from commit da06600c806375c5a7eb30d09845de12112a752f)
-
-Add bool operation for Struct#[]
-
-(cherry picked from commit 5cd65c41941d6e6788444817185e0fa23cfb71f9)
-
-Conflicts:
-	ext/ffi_c/AbstractMemory.c
----
- ext/ffi_c/AbstractMemory.c       | 16 ++++++++++++++++
- ext/ffi_c/AbstractMemory.h       |  3 +++
- lib/ffi/struct_layout_builder.rb |  3 ++-
- spec/ffi/struct_spec.rb          | 11 +++++++++++
- 4 files changed, 32 insertions(+), 1 deletion(-)
-
-diff --git a/ext/ffi_c/AbstractMemory.c b/ext/ffi_c/AbstractMemory.c
-index 5359bc7..1849d16 100644
---- a/ext/ffi_c/AbstractMemory.c
-+++ b/ext/ffi_c/AbstractMemory.c
-@@ -256,6 +256,21 @@ get_pointer_value(VALUE value)
- 
- NUM_OP(pointer, void *, get_pointer_value, rbffi_Pointer_NewInstance, NOSWAP);
- 
-+static inline uint8_t
-+rbffi_bool_value(VALUE value)
-+{
-+    return RTEST(value);
-+}
-+
-+static inline VALUE
-+rbffi_bool_new(uint8_t value)
-+{
-+    return (value & 1) != 0 ? Qtrue : Qfalse;
-+}
-+
-+NUM_OP(bool, unsigned char, rbffi_bool_value, rbffi_bool_new, NOSWAP);
-+
-+
- static VALUE
- memory_clear(VALUE self)
- {
-@@ -535,6 +550,7 @@ MemoryOps rbffi_AbstractMemoryOps = {
-     .float64 = &memory_op_float64,
-     .pointer = &memory_op_pointer,
-     .strptr = &memory_op_strptr,
-+    .boolOp = &memory_op_bool,
- };
- 
- void
-diff --git a/ext/ffi_c/AbstractMemory.h b/ext/ffi_c/AbstractMemory.h
-index 1ba5bcb..f902856 100644
---- a/ext/ffi_c/AbstractMemory.h
-+++ b/ext/ffi_c/AbstractMemory.h
-@@ -60,6 +60,7 @@ typedef struct {
-     MemoryOp* float64;
-     MemoryOp* pointer;
-     MemoryOp* strptr;
-+    MemoryOp* boolOp;
- } MemoryOps;
- 
- struct AbstractMemory_ {
-@@ -136,6 +137,8 @@ get_memory_op(Type* type)
-             return rbffi_AbstractMemoryOps.pointer;
-         case NATIVE_STRING:
-             return rbffi_AbstractMemoryOps.strptr;
-+        case NATIVE_BOOL:
-+            return rbffi_AbstractMemoryOps.boolOp;
-         default:
-             return NULL;
-     }
-diff --git a/lib/ffi/struct_layout_builder.rb b/lib/ffi/struct_layout_builder.rb
-index c1aec44..40f0066 100644
---- a/lib/ffi/struct_layout_builder.rb
-+++ b/lib/ffi/struct_layout_builder.rb
-@@ -71,6 +71,7 @@ module FFI
-       Type::UINT64,
-       Type::FLOAT32,
-       Type::FLOAT64,
-+      Type::BOOL,
-     ]
- 
-     def add(name, type, offset = nil)
-@@ -155,4 +156,4 @@ module FFI
-     end
-   end
- 
--end
-\ No newline at end of file
-+end
-diff --git a/spec/ffi/struct_spec.rb b/spec/ffi/struct_spec.rb
-index 4c00c93..4add214 100644
---- a/spec/ffi/struct_spec.rb
-+++ b/spec/ffi/struct_spec.rb
-@@ -669,4 +669,15 @@ describe "Struct allocation" do
-     end
-     S.new(FFI::MemoryPointer.new(S)).null?.should be_false
-   end
-+
-+  it "supports :bool as a struct member" do
-+    lambda do
-+      c = Class.new(FFI::Struct) do
-+        layout :b, :bool
-+      end
-+      struct = c.new
-+      struct[:b] = ! struct[:b]
-+    end.should_not raise_error
-+  end
-+
- end
--- 
-1.9.3
-

rubygem-ffi.spec

@@ -1,33 +1,25 @@
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 %global gem_name ffi
-%global libname %{gem_name}_c.so
-%global githubhash b79eb61
-%global githubbuild 0
-%global tarballname ffi-ffi-%{version}-%{githubbuild}-g%{githubhash}
-%global gitinternalname ffi-ffi-%{githubhash}
 
-Name:           rubygem-%{gem_name}
-Version:        1.0.9
-Release:        10%{?dist}
-Summary:        FFI Extensions for Ruby
-Group:          Development/Languages
-
-License:        LGPLv3
-URL:            http://wiki.github.com/ffi/ffi
-# The source file is hosted at github. You can access this tarball with
-# the following link:
-#          http://github.com/ffi/ffi/tarball/1.0.9
-Source0:        %{tarballname}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Patch1:         0001-Fix-issue-114-Structs-no-longer-support-bools.patch
-
-BuildRequires:  ruby-devel rubygems-devel rubygem(rake) rubygem(rake-compiler) libffi-devel rubygem(rspec-core)
-BuildRequires:  pkgconfig
-Requires:       libffi
-Requires: ruby(rubygems)
-Requires:       ruby(abi) = 1.8
-Provides:       rubygem(%{gem_name}) = %{version}
+Name: rubygem-%{gem_name}
+Version: 1.15.5
+Release: 4%{?dist}
+Summary: FFI Extensions for Ruby
+License: BSD
+URL: https://github.com/ffi/ffi/wiki
+Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# git clone https://github.com/ffi/ffi.git --no-checkout
+# cd ffi && git archive -v -o ffi-1.15.5-spec.txz v1.15.5 spec/
+Source1: %{gem_name}-%{version}-spec.txz
+BuildRequires: make
+BuildRequires: ruby(release)
+BuildRequires: rubygems-devel
+BuildRequires: ruby-devel
+# Compiler is required for build of gem binary extension.
+# https://fedoraproject.org/wiki/Packaging:C_and_C++#BuildRequires_and_Requires
+BuildRequires: gcc
+BuildRequires: libffi-devel
+BuildRequires: rubygem(rspec) >= 3
+BuildRequires: rubygem(bigdecimal)
 
 %description
 Ruby-FFI is a ruby extension for programmatically loading dynamic
@@ -36,69 +28,216 @@ from Ruby code. Moreover, a Ruby-FFI extension works without changes
 on Ruby and JRuby. Discover why should you write your next extension
 using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].
 
+%package doc
+Summary: Documentation for %{name}
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+Documentation for %{name}.
+
 %prep
-%setup -q -n %{gitinternalname}
-%patch1 -p1
+%setup -q -n  %{gem_name}-%{version} -b 1
 
 %build
-export CFLAGS="%{optflags}"
-export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-rake gem
-gem install -V -d --local --no-ri -i ./geminst --force pkg/%{gem_name}-%{version}.gem
+# Create the gem as gem install only works on a gem file
+gem build ../%{gem_name}-%{version}.gemspec
+%gem_install
 
 %install
-rm -rf %{buildroot}
-mkdir %{buildroot}
-install -d -m0755 %{buildroot}%{gem_dir}
-install -d -m0755  %{buildroot}%{ruby_sitearch}
-cp -R %{_builddir}/%{gitinternalname}/geminst/* %{buildroot}%{gem_dir}
-mv %{buildroot}%{gem_libdir}/%{libname} %{buildroot}%{ruby_sitearch}/%{libname}
-rm -rf %{buildroot}%{gem_instdir}/ext
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
+
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
+
+# Prevent dangling symlink in -debuginfo (rhbz#878863).
+rm -rf %{buildroot}%{gem_instdir}/ext/
+
 
 %check
-# https://github.com/ffi/ffi/issues/189
-sed -i -e 's| -mimpure-text||' libtest/GNUmakefile
-rake -v test
+pushd .%{gem_instdir}
+ln -s %{_builddir}/spec spec
 
-%clean
-rm -rf %{buildroot}
+# Build the test library with Fedora build options.
+pushd spec/ffi/fixtures
+make JFLAGS="%{optflags}"
+popd
+
+# Recent libffi corrupts dynamically allocated closures with call to fork.
+# https://bugzilla.redhat.com/show_bug.cgi?id=2040380
+mv spec/ffi/fork_spec.rb{,.disabled}
+
+RUBYOPT="-I$(dirs +1)%{gem_extdir_mri}" rspec spec
+popd
 
 %files
-%defattr(-,root,root,-)
-%doc %{gem_instdir}/README.rdoc
-%doc %{gem_instdir}/History.txt
-%doc %{gem_instdir}/LICENSE
-%doc %{gem_docdir}
 %dir %{gem_instdir}
-# This file does not exist in 15
-%if 0%{?fedora} <= 14
-    %{gem_instdir}/.require_paths
-%endif
-%{gem_instdir}/Rakefile
-%{gem_instdir}/gen
+%{gem_extdir_mri}
+%exclude %{gem_instdir}/.*
+%license %{gem_instdir}/COPYING
+%license %{gem_instdir}/LICENSE
+%license %{gem_instdir}/LICENSE.SPECS
 %{gem_libdir}
-%{gem_instdir}/spec
-%{gem_instdir}/tasks
-%{ruby_sitearch}/%{libname}
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
 
+%files doc
+%doc %{gem_docdir}
+%doc %{gem_instdir}/CHANGELOG.md
+%{gem_instdir}/Gemfile
+%doc %{gem_instdir}/README.md
+%{gem_instdir}/Rakefile
+%{gem_instdir}/samples
+%{gem_instdir}/ffi.gemspec
+%{gem_instdir}/rakelib/ffi_gem_helper.rb
 
 %changelog
-* Wed Oct 08 2014 Dominic Cleal <dcleal@redhat.com> - 1.0.9-10
-- Fix support for bools in structs (upstream #114)
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Wed Mar 26 2014 Dominic Cleal <dcleal@redhat.com> - 1.0.9-9
-- Fix install location of built library and gemspec (RHBZ#975332)
+* Thu Jan 27 2022 Vít Ondruch <vondruch@redhat.com> - 1.15.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.1
 
-* Thu Jan 07 2013 Bryan Kearney <bkearney@redhat.com> - 1.0.9-8
-- Change the ruby version back to 1.8
+* Thu Jan 27 2022 Vít Ondruch <vondruch@redhat.com> - 1.15.5-2
+- Disable fork spec broken by recent libffi.
+- Re-enable long double test fixed by FFI 1.15.5.
 
-* Thu Jan 03 2013 Bryan Kearney <bkearney@redhat.com> - 1.0.9-7
-- Add the gem macros which rubygems-devel would have provided
+* Thu Jan 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.15.5-2
+- F-36: rebuild against ruby31
 
-* Wed Jan 01 2013 Bryan Kearney <bkearney@redhat.com> - 1.0.9-6
-- Change dependency to rubygems instead of rubgems-devel
+* Tue Jan 18 2022 Pavel Valena <pvalena@redhat.com> - 1.15.5-1
+- Update to ffi 1.15.5.
+  Resolves: rhbz#2038923
+
+* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 1.15.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
+
+* Mon Sep 13 2021 Pavel Valena <pvalena@redhat.com> - 1.15.4-1
+- Update to ffi 1.15.4.
+  Resolves: rhbz#1909309
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan  6 2021 Vít Ondruch <vondruch@redhat.com> - 1.13.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.0
+
+* Thu Dec 03 2020 Vít Ondruch <vondruch@redhat.com> - 1.13.1-1
+- Disable long double test failing on i686.
+
+* Thu Nov 12 22:57:22 CET 2020 Pavel Valena <pvalena@redhat.com> - 1.13.1-1
+- Update to ffi 1.13.1.
+  Resolves: rhbz#1797215
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 20 2020 Pavel Valena <pvalena@redhat.com> - 1.12.1-1
+- Update to ffi 1.12.1.
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 23 2019 Pavel Valena <pvalena@redhat.com> - 1.10.0-1
+- Update to FFI 1.10.0.
+
+* Thu Jan 17 2019 Vít Ondruch <vondruch@redhat.com> - 1.9.23-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.6
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 28 2018 Vít Ondruch <vondruch@redhat.com> - 1.9.23-1
+- Update to FFI 1.9.23.
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.18-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 1.9.18-6
+- Rebuilt for switch to libxcrypt
+
+* Tue Jan 09 2018 Vít Ondruch <vondruch@redhat.com> - 1.9.18-5
+- Re-enable rdoc generation.
+
+* Fri Jan 05 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.18-4
+- F-28: rebuild for ruby25
+- Disabling rdoc generation for now to avoid segfault
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Mar 31 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.18-1
+- 1.9.18
+
+* Fri Feb 10 2017 Jun Aruga <jaruga@redhat.com> - 1.9.14-3
+- Suppress deprecated Fixnum warnings on Ruby 2.4.0.
+
+* Tue Jan 10 2017 Vít Ondruch <vondruch@redhat.com> - 1.9.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.4
+
+* Tue Jan 03 2017 Vít Ondruch <vondruch@redhat.com> - 1.9.14-1
+- Update to FFI 1.9.14.
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jan 08 2016 Vít Ondruch <vondruch@redhat.com> - 1.9.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
+
+* Sat Oct  3 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.10-1
+- 1.9.10
+
+* Mon Jul 20 2015 Vít Ondruch <vondruch@redhat.com> - 1.9.3-7
+- Fix dangling symlinks in -debuginfo package.
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Jan 23 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.9.3-5
+- fixed to build on aarch64
+
+* Fri Jan 16 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3-4
+- Rebuild for ruby 2.2 again
+
+* Thu Jan 15 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3-3
+- Rebuild for ruby 2.2
+- Use rspec2 for now
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Thu Jun 05 2014 Dominic Cleal <dcleal@redhat.com> - 1.9.3-1
+- Update to FFI 1.9.3
+
+* Sat May  3 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.4.0-4
+- F-21: rebuild for ruby 2.1 / rubygems 2.2
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Mar 26 2013 Vít Ondruch <vondruch@redhat.com> - 1.4.0-2
+- Use %%{gem_extdir_mri} instead of %%{gem_extdir}.
+
+* Wed Feb 20 2013 Vít Ondruch <vondruch@redhat.com> - 1.4.0-1
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+- Update to FFI 1.4.0.
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
@@ -121,10 +260,10 @@ rm -rf %{buildroot}
 * Wed Mar 10 2010 Bryan Kearney <bkearney@redhat.com> - 0.6.2-1
 - Power PC fixes from upstream which were found testing 0.6.2
 
-* Tue Feb 22 2010 Bryan Kearney <bkearney@redhat.com> - 0.6.2-1
+* Mon Feb 22 2010 Bryan Kearney <bkearney@redhat.com> - 0.6.2-1
 - Pull in 0.6.2 from upstream
 
-* Tue Feb 22 2010 Bryan Kearney <bkearney@redhat.com> - 0.5.4-3
+* Mon Feb 22 2010 Bryan Kearney <bkearney@redhat.com> - 0.5.4-3
 - Final updates based on package review
 
 * Tue Feb 16 2010 Bryan Kearney <bkearney@redhat.com> - 0.5.4-2

sources

@@ -1 +1,2 @@
-63bad50d484d539b718a9db7c035a4aa  ffi-ffi-1.0.9-0-gb79eb61.tar.gz
+SHA512 (ffi-1.15.5.gem) = 074df34edffc7038ab08199350a97b32280d61ea15dd85d459b008bd3363ec5403b4e533621c8e460e5288f01fec944bff9b149851b819e85bab75ad2362227c
+SHA512 (ffi-1.15.5-spec.txz) = 746e69d9d9d43f53b165898c943b6acb6fea0bf5bf0669fade331a5a38bace4cf9de59dda09c57f4fc5ad8b22ead5aa72f07e61318d7ed794e9cefe76dee55a3