Move changelog to markdown and add unreleased changes

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @agrare @Fryguy

.github/workflows/ci.yaml

@@ -0,0 +1,25 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: '0 0 * * 0'
+  workflow_dispatch:
+
+jobs:
+  ci:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+        - ubi8
+        - ubi9
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build docker image
+      run: rake docker_images[${{ matrix.platform }}]
+    - name: Run tests
+      run: rake docker_test[${{ matrix.platform }}]

.whitesource

@@ -0,0 +1,3 @@
+{
+  "settingsInheritedFrom": "ManageIQ/whitesource-config@master"
+}

CHANGELOG.md

@@ -0,0 +1,63 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+### Added
+- Detect librpm.so.8
+- Make rpm_version_macro available in c/rpmmacro
+- Attach addMacro/delMacro as rpmPushMacro and rpmPopMacro in >= 4.14.0
+- Detect librpm.so.9 ([#5](https://github.com/ManageIQ/ruby-rpm-ffi2/pull/5))
+
+### Changed
+- MiniTest::Unit::TestCase is now Minitest::Test
+- Rename rpm gem to rpm2 ([#1](https://github.com/ManageIQ/ruby-rpm-ffi2/pull/1))
+- Replace TravisCI with Github Actions ([#3](https://github.com/ManageIQ/ruby-rpm-ffi2/pull/3))
+
+### Fixed
+- Do not attach deprecated headerNVR on >= 4.14.0
+- Handle deprecated addMacro/delMacro
+- Do not use headerNVR in Package.version ([#4](https://github.com/ManageIQ/ruby-rpm-ffi2/pull/4))
+- Use rpmExpandMacros on rpm v4.14+ for `RPM#[]` ([#12](https://github.com/ManageIQ/ruby-rpm-ffi2/pull/12))
+
+## [0.0.5] - 2016-07-09
+### Added
+- Add rake for travis
+- Search for librpm.so.3 too
+
+### Changed
+- Moved to minitest
+- ruby 1.9.x not supported anymore
+
+## [0.0.4] - 2013-10-24
+### Fixed
+- Bugfix: too many open files on transaction with blocks
+- Fixing the access to FileAttrs and FileState constants from RPM::File
+
+## [0.0.3] - 2012-02-23
+### Changed
+- RPM::FFI module is now RPM::C
+
+### Added
+- implement Trasaction#commit, Trasaction#install, Trasaction#upgrade,
+
+## [0.0.2] - 2012-01-04
+### Added
+- Add MatchIterator support and expose it in Transaction
+- Implement transaction callback
+- Implemented RPM::File
+- implement RPM#[]=
+
+### Changed
+- Renamed RPM::Header to RPM::Package
+
+### Fixed
+- Fix name not getting set. Better use headerPutString
+- Fix RPM#[]
+
+[Unreleased]: https://github.com/ManageIQ/ruby-rpm-ffi2/compare/v0.0.5...HEAD
+[0.0.5]: https://github.com/ManageIQ/ruby-rpm-ffi2/compare/v0.0.4...v0.0.5
+[0.0.4]: https://github.com/ManageIQ/ruby-rpm-ffi2/compare/v0.0.3...v0.0.4
+[0.0.3]: https://github.com/ManageIQ/ruby-rpm-ffi2/compare/v0.0.2...v0.0.3
+[0.0.2]: https://github.com/ManageIQ/ruby-rpm-ffi2/compare/aa5c84efc5...v0.0.2

MIT-LICENSE

@@ -1,24 +1,23 @@
-
+Copyright © 2025 ManageIQ Authors
 Copyright © 2011 Duncan Mac-Vicar Prett <[email protected]>
 Copyright © 2011 SUSE Linux Products GmbH
 Copyright © 2002 Kenta Murata
- 
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including
 without limitation the rights to use, copy, modify, merge, publish,
 distribute, sublicense, and/or sell copies of the Software, and to
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
- 
+
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
- 
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

README.md

@@ -1,9 +1,7 @@
 
 # RPM bindings for ruby
 
-![maintained](https://img.shields.io/maintenance/yes/2016.svg) [![Build Status](https://travis-ci.org/dmacvicar/ruby-rpm-ffi.svg?branch=master)](https://travis-ci.org/dmacvicar/ruby-rpm-ffi)
-
-* http://github.com/dmacvicar/ruby-rpm-ffi
+[![CI](https://github.com/ManageIQ/ruby-rpm-ffi2/actions/workflows/ci.yaml/badge.svg)](https://github.com/ManageIQ/ruby-rpm-ffi2/actions/workflows/ci.yaml)
 
 # WARNING
 
@@ -70,7 +68,7 @@ This gem:
 
 * Is pure ruby
 * Is documented
-* Has as a goal to support only the latest rpm version plus the ones in 
+* Has as a goal to support only the latest rpm version plus the ones in
   use some releases back in popular rpm based distros
 * Uses FFI, so it should work with other interpreters
   (Because https://github.com/rubinius/rubinius/issues/682 it currently does
@@ -366,11 +364,11 @@ rake docker_test
 
 # LICENSE
 
+* Copyright © 2025 ManageIQ Authors
 * Copyright © 2011 Duncan Mac-Vicar Prett <[email protected]>
 * Copyright © 2011 SUSE Linux Products GmbH
 
 * This gem is a pure-ruby rewrite of ruby-rpm:
   Copyright © 2002 Kenta Murata. Relicensed with his permission.
 
 Licensed under the MIT license. See MIT-LICENSE for details.
-

Rakefile

@@ -35,18 +35,24 @@ rescue LoadError
   end
 end
 
-task :docker_images do
-  Dir.chdir('_docker') do
-    Dir.glob('Dockerfile.*').each do |dockerfile|
-      tag = 'ruby-rpm-ffi:' + File.extname(dockerfile).delete('.')
-      sh %(docker build -f #{dockerfile} -t #{tag} .)
-    end
+def each_dockerfile(platform)
+  platform ||= "*"
+  Dir.glob("_docker/Dockerfile.#{platform}").each do |dockerfile|
+    tag = "localhost/ruby-rpm-ffi:#{File.extname(dockerfile).delete('.')}"
+    yield dockerfile, tag
+  end
+end
+
+desc "Build the docker images for test"
+task :docker_images, [:platform] do |_t, args|
+  each_dockerfile(args[:platform]) do |dockerfile, tag|
+    sh "podman build --platform=linux/amd64 -f #{dockerfile} -t #{tag} ."
   end
 end
 
-task :docker_test do
-  Dir.glob('_docker/Dockerfile.*').each do |dockerfile|
-    tag = 'ruby-rpm-ffi:' + File.extname(dockerfile).delete('.')
-    sh %(docker run -ti -v #{Dir.pwd}:/src #{tag} rake test)
+desc "Run the tests from within the docker images"
+task :docker_test, [:platform] do |_t, args|
+  each_dockerfile(args[:platform]) do |dockerfile, tag|
+    sh "podman run --platform=linux/amd64 --rm -ti -v #{Dir.pwd}:/src #{tag} rake test"
   end
 end

_docker/Dockerfile.ubi8

@@ -0,0 +1,8 @@
+FROM registry.access.redhat.com/ubi8/ubi
+RUN dnf module -y enable ruby:3.1
+RUN dnf install -y ruby git
+RUN gem install bundler
+WORKDIR /src
+RUN ls -lR
+COPY ../ /src
+RUN bundle install

_docker/Dockerfile.ubi9

@@ -0,0 +1,8 @@
+FROM registry.access.redhat.com/ubi9/ubi
+RUN dnf module -y enable ruby:3.3
+RUN dnf install -y ruby git
+RUN gem install bundler
+WORKDIR /src
+RUN ls -lR
+COPY ../ /src
+RUN bundle install

lib/rpm.rb

@@ -41,11 +41,22 @@ def self.transaction(root = '/')
   # @param [String] name Name of the macro
   # @return [String] value of macro +name+
   def self.[](name)
-    val = ''
-    buffer = ::FFI::MemoryPointer.new(:pointer, 1024)
-    buffer.write_string("%{#{name}}")
-    ret = RPM::C.expandMacros(nil, nil, buffer, 1024)
-    buffer.read_string
+    if C::rpm_version_code >= ((4 << 16) + (14 << 8) + (0 << 0))
+      obuf = ::FFI::MemoryPointer.new(:pointer, 1)
+      sbuf = FFI::MemoryPointer.from_string("%{#{name}}")
+      ret = RPM::C.rpmExpandMacros(nil, sbuf, obuf, 0)
+      raise if ret < 0
+
+      val = obuf.read_pointer
+      val.nil? ? nil : val.read_string
+    else
+      buffer = ::FFI::MemoryPointer.new(:pointer, 1024)
+      buffer.write_string("%{#{name}}")
+      ret = RPM::C.expandMacros(nil, nil, buffer, 1024)
+      raise if ret < 0
+
+      buffer.read_string
+    end
   end
 
   # Setup a macro

lib/rpm/c.rb

@@ -6,6 +6,7 @@ module C
 
     begin
       ffi_lib ['rpm',
+               'librpm.so.9',
                'librpm.so.8', # Tumbleweed
                'librpm.so.7', # fedora 23
                'librpm.so.3', 'librpm.so.2', 'librpm.so.1']

lib/rpm/c/rpmio.rb

@@ -12,8 +12,6 @@ module C
 
     attach_function 'fdDup', [:int], :FD_t
 
-    attach_function 'Fstrerror', [:FD_t], :string
-
     attach_function 'fdLink', [:pointer], :FD_t
   end
 end

lib/rpm/c/rpmmacro.rb

@@ -19,6 +19,7 @@ module C
     if rpm_version_code >= ((4 << 16) + (14 << 8) + (0 << 0))
       attach_function 'rpmPushMacro', [:pointer, :string, :string, :string, :int], :void
       attach_function 'rpmPopMacro', [:pointer, :string], :void
+      attach_function 'rpmExpandMacros', [:pointer, :pointer, :pointer, :int], :int
     else
       attach_function 'addMacro', [:pointer, :string, :string, :string, :int], :void
       attach_function 'delMacro', [:pointer, :string], :void

lib/rpm/c/rpmts.rb

@@ -62,8 +62,6 @@ module C
     attach_function 'rpmtsFlags', [:rpmts], :rpmtransFlags
     attach_function 'rpmtsSetFlags', %i[rpmts rpmtransFlags], :rpmtransFlags
     # ...
-    attach_function 'rpmtsSetNotifyCallback', %i[rpmts rpmCallbackFunction rpmCallbackData], :int
-    # ...
     attach_function 'rpmtsCreate', [], :rpmts
     attach_function 'rpmtsAddInstallElement', %i[rpmts header fnpyKey int rpmRelocation], :int
     attach_function 'rpmtsAddEraseElement', %i[rpmts header int], :int

lib/rpm/package.rb

@@ -215,7 +215,6 @@ def changelog
     # @return [String, Fixnum, Array<String>, Array<Fixnum>, nil]
     #   The value of the entry
     def [](tag)
-      val = nil
       tagc = ::FFI::AutoPointer.new(RPM::C.rpmtdNew, Package.method(:release_td))
 
       return nil if RPM::C.headerGet(ptr, tag, tagc,
@@ -261,15 +260,7 @@ def arch
 
     # @return [Version] Version for this package
     def version
-      v_ptr = ::FFI::MemoryPointer.new(:pointer, 1)
-      r_ptr = ::FFI::MemoryPointer.new(:pointer, 1)
-
-      RPM::C.headerNVR(ptr, nil, v_ptr, r_ptr)
-      v = v_ptr.read_pointer.read_string
-      r = r_ptr.read_pointer.read_string
-      v_ptr.free
-      r_ptr.free
-      Version.new(v, r, self[:epoch])
+      Version.new(self[:version], self[:release], self[:epoch])
     end
 
     # String representation of the package: "name-version-release-arch"
@@ -324,7 +315,7 @@ def initialize_from_filename(filename)
         fd = RPM::C.Fopen(filename, 'r')
         raise "#{filename} : #{RPM::C.Fstrerror(fd)}" if RPM::C.Ferror(fd) != 0
         RPM.transaction do |ts|
-          rc = RPM::C.rpmReadPackageFile(ts.ptr, fd, filename, hdr)
+          RPM::C.rpmReadPackageFile(ts.ptr, fd, filename, hdr)
         end
       ensure
         RPM::C.Fclose(fd) unless fd.nil?

lib/rpm/transaction.rb

@@ -164,8 +164,6 @@ def check
     # end
     # @yield [CallbackData] sig Transaction progress
     def commit
-      flags = RPM::C::TransFlags[:none]
-
       callback = proc do |hdr, type, amount, total, key_ptr, data_ignored|
         key_id = key_ptr.address
         key = @keys.include?(key_id) ? @keys[key_id] : nil

lib/rpm/version.rb

@@ -91,7 +91,7 @@ def initialize(*argv)
     #
     def <=>(other)
       RPM::Utils.check_type(other, RPM::Version)
-      ret = RPM::C.rpmvercmp(to_vre_epoch_zero, other.to_vre_epoch_zero)
+      RPM::C.rpmvercmp(to_vre_epoch_zero, other.to_vre_epoch_zero)
     end
 
     # @param [Version] other Version to compare against
@@ -110,15 +110,15 @@ def older?(other)
     # @return [String]
     # @note The epoch is not included
     def to_vr
-      vr = @r.nil? ? @v.to_s : "#{@v}-#{@r}"
+      @r.nil? ? @v.to_s : "#{@v}-#{@r}"
     end
 
     # String representation in the form "e:v-r"
     # @return [String]
     # @note The epoch is included if present
     def to_vre(_opts = {})
       vr = to_vr
-      vre = @e.nil? ? vr : "#{@e}:#{vr}"
+      @e.nil? ? vr : "#{@e}:#{vr}"
     end
 
     # Alias for +to_vr+
@@ -140,7 +140,7 @@ def hash
     # @note The epoch is included always. As 0 if not present
     def to_vre_epoch_zero
       vr = to_vr
-      vre = @e.nil? ? "0:#{vr}" : "#{@e}:#{vr}"
+      @e.nil? ? "0:#{vr}" : "#{@e}:#{vr}"
     end
   end
 end

lib/rpm2.rb

@@ -0,0 +1 @@
+require_relative "./rpm"