systemd-journal 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dba31ecf5a267f987bbb2f8986c9c73039a9b6baf51803a717cc5658fdfcee96
-  data.tar.gz: bac252ca548a5d09d316f8445b0f17e5307e9ccf5a41beb0443e3dabc8495ab7
+  metadata.gz: e5c615cee8de41012105d99aec5b93f8c88f322b67bbf4d97bcb4afbd74cec35
+  data.tar.gz: 84447c503addd9fc6c3c6564472e7eb1558f6e6a184a98214c604feb2649ecea
 SHA512:
-  metadata.gz: 05f31a764d3f64ead90e25b3956778c5c563bd4133c994e76920fb3702b889c8d0042205e99e8be8d6c9884dc70ea29cb4429299239014d406344318547bff80
-  data.tar.gz: ab946f8aaa1555591828571bb31ea2861d0dace3a32f1f97fe50af981901e993cf030667d637c4e47ed64a05dbfe57939f3673eb32e7e2ea074aeb2a6e264267
+  metadata.gz: dd1375594a013f9d237c0a62f5c4aed77f80b54637e1275cf32565905fde72187eb08feefc4d93129a3a942949de93d2f037b0af2893e95f52c006d682e32b39
+  data.tar.gz: 9debfc4954cc65ddf9fda2d448c30b67c0995cf2ad554dcfb00b067103218a5898d8d9f619e6b04236d184742397d64b5365efbbd90cb0be6f26a25cbeb8887b

data/.github/workflows/ruby.yml

@@ -6,12 +6,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu]
-        ruby: [2.5, 2.6, 2.7, jruby]
+        ruby: [3.0, 3.1, 3.2, 3.3]
     runs-on: ${{ matrix.os }}-latest
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+    - run: sudo apt-get install libjemalloc2 --yes
     - run: bundle install
+    - run: bundle exec rake compile
     - run: bundle exec rake spec
+    - run: LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2 bundle exec rake spec

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 certs/gem-private_key.pem
+lib/**/*.so

data/README.md

@@ -10,7 +10,7 @@ Ruby bindings for reading from the systemd journal.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'systemd-journal', '~> 1.4'
+gem 'systemd-journal', '~> 2.0'
 ```
 
 And then execute:
@@ -19,20 +19,6 @@ And then execute:
 bundle install
 ```
 
-If you have trust issues, fear not:
-
-```sh
-wget https://raw.githubusercontent.com/ledbettj/systemd-journal/master/certs/john@throttle.io.pem
-gem cert --add john@throttle.io.pem
-```
-
-You can then verify the signature at install time with either `gem` or `bundler`:
-
-```sh
-gem install systemd-journal -P HighSecurity
-bundle install --trust-policy HighSecurity
-```
-
 ## Dependencies
 
 Obviously you will need to have
@@ -159,17 +145,28 @@ necessary until v246 is released.
 
 In ArchLinux, this patch is applied in systemd-libs 245.6-2.
 
+### I don't get any output when reading from/into a container!
+
+The most likely cause of this is a version mismatch between `libsystemd` on the 
+host and in the container, where the older version does not support features used
+by the newer version.  If you run `journalctl` you might see:
+
+> Journal file ... uses an unsupported feature, ignoring file.
+
+Sadly, this error case is not exposed via the `libsystemd` API so this gem does 
+not know when this happens.  There are two potential workarounds:
+
+* Ensure that the version of `libsystemd` are compatible across host/container
+* Disable the features that are not supported by the older version to cause the
+  newer version to emit compatible journal files.
+
+
 ## Issues?
 
 This gem has been tested primarily on MRI and Arch Linux running systemd version
 208 and up.  Please let me know if you have issues with other versions or
 distributions.
 
-The gem will run under JRuby, although some features which rely on native file
-descriptor support will not work.
-
-The gem will not run under truffleruby due to missing support for some FFI features.
-
 If you run into problems or have questions, please open an
 [Issue](https://github.com/ledbettj/systemd-journal/issues) or Pull Request.
 

data/Rakefile

@@ -1,9 +1,10 @@
 require 'bundler/gem_tasks'
 require 'yard'
 require 'rspec/core/rake_task'
+require "rake/extensiontask"
 
 unless ENV['RUBOCOP'] == 'false'
-  require 'rubocop/rake_task' 
+  require 'rubocop/rake_task'
 
   RuboCop::RakeTask.new(:rubocop) do |task|
     task.patterns = ['lib/**/*.rb', 'spec/**/*.rb']
@@ -25,4 +26,10 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w(--color)
 end
 
+GEMSPEC = Gem::Specification.load("systemd-journal.gemspec")
+
+Rake::ExtensionTask.new("shim", GEMSPEC) do |ext|
+  ext.lib_dir = "lib/systemd/journal/"
+end
+
 task default: :spec

data/ext/shim/extconf.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "mkmf"
+
+# Makes all symbols private by default to avoid unintended conflict
+# with other gems. To explicitly export symbols you can use RUBY_FUNC_EXPORTED
+# selectively, or entirely remove this flag.
+append_cflags("-fvisibility=hidden")
+
+create_makefile("systemd/journal/shim")

data/ext/shim/shim.c

@@ -0,0 +1,25 @@
+#include "shim.h"
+
+VALUE rb_mShim;
+
+VALUE shim_free(VALUE self, VALUE ptr);
+
+RUBY_FUNC_EXPORTED void
+Init_shim(void)
+{
+  VALUE mSystemd = rb_define_module("Systemd");
+  VALUE cJournal = rb_define_class_under(mSystemd, "Journal", rb_cObject);
+  rb_mShim = rb_define_module_under(cJournal, "Shim");
+
+  rb_define_module_function(rb_mShim, "free", shim_free, 1);
+}
+
+VALUE shim_free(VALUE self, VALUE ptr) {
+  VALUE rb_addr = rb_funcall(ptr, rb_intern("address"), 0);
+  void* addr = (void*)NUM2ULL(rb_addr);
+  if (addr) {
+    free(addr);
+  }
+
+  return Qnil;
+}

data/ext/shim/shim.h

@@ -0,0 +1,6 @@
+#ifndef SHIM_H
+#define SHIM_H 1
+
+#include "ruby.h"
+
+#endif /* SHIM_H */

data/lib/systemd/journal/native.rb

@@ -86,13 +86,4 @@ module Systemd
       attach_function :sd_journal_get_usage, [:pointer, :pointer], :int
     end
   end
-
-  # @private
-  module LibC
-    require 'ffi'
-    extend FFI::Library
-    ffi_lib FFI::Library::LIBC
-
-    attach_function :free, [:pointer], :void
-  end
 end

data/lib/systemd/journal/version.rb

@@ -1,6 +1,6 @@
 module Systemd
   class Journal
     # The version of the systemd-journal gem.
-    VERSION = '1.4.2'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

data/lib/systemd/journal.rb

@@ -6,6 +6,7 @@ require 'systemd/journal/fields'
 require 'systemd/journal/navigable'
 require 'systemd/journal/filterable'
 require 'systemd/journal/waitable'
+require 'systemd/journal/shim'
 require 'systemd/journal_error'
 require 'systemd/journal_entry'
 require 'systemd/id128'
@@ -322,7 +323,7 @@ module Systemd
     # frees the char*, and returns the ruby string.
     def self.read_and_free_outstr(ptr)
       str = ptr.read_string
-      LibC.free(ptr)
+      Shim.free(ptr)
       str
     end
   end

data/systemd-journal.gemspec

@@ -8,31 +8,26 @@ Gem::Specification.new do |gem|
   gem.version       = Systemd::Journal::VERSION
   gem.license       = 'MIT'
   gem.authors       = ['John Ledbetter', 'Daniel Mack']
-  gem.email         = ['john@throttle.io']
+  gem.email         = ['john@weirdhorse.party']
   gem.description   = 'Provides the ability to navigate and read entries from the systemd journal in ruby, as well as write events to the journal.'
   gem.summary       = 'Ruby bindings to libsystemd-journal'
   gem.homepage      = 'https://github.com/ledbettj/systemd-journal'
 
-  gem.cert_chain    = Dir['certs/john@throttle.io.pem']
-
-  if $PROGRAM_NAME.end_with?('gem')
-    gem.signing_key = ENV['GEM_SIGNING_KEY']
-    raise ArgumentError, 'Please set GEM_SIGNING_KEY' if gem.signing_key.nil?
-  end
-
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
+  gem.extensions    = ["ext/shim/extconf.rb"]
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 3.0'
 
   gem.add_runtime_dependency 'ffi', '~> 1.9'
 
-  gem.add_development_dependency 'rspec',     '~> 3.4'
-  gem.add_development_dependency 'simplecov', '~> 0.9'
-  gem.add_development_dependency 'rubocop',   '~> 0.26' unless ENV['RUBOCOP'] == 'false'
-  gem.add_development_dependency 'rake',      '~> 12.3'
+  gem.add_development_dependency 'pry',       '~> 0.14'
+  gem.add_development_dependency 'rake',      '~> 13.1'
+  gem.add_development_dependency 'rspec',     '~> 3.13'
+  gem.add_development_dependency 'rubocop',   '~> 1.61' unless ENV['RUBOCOP'] == 'false'
+  gem.add_development_dependency 'simplecov', '~> 0.22'
   gem.add_development_dependency 'yard',      '~> 0.9'
-  gem.add_development_dependency 'pry',       '~> 0.10'
+  gem.add_development_dependency 'rake-compiler'
 end

metadata

@@ -1,41 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: systemd-journal
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0
 platform: ruby
 authors:
 - John Ledbetter
 - Daniel Mack
 autorequire:
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEMDCCApigAwIBAgIBATANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZqb2hu
-  L0RDPXRocm90dGxlL0RDPWlvMB4XDTIwMDczMDIyMTUxNVoXDTIxMDczMDIyMTUx
-  NVowITEfMB0GA1UEAwwWam9obi9EQz10aHJvdHRsZS9EQz1pbzCCAaIwDQYJKoZI
-  hvcNAQEBBQADggGPADCCAYoCggGBAMEZjnWtA5/YsYEDvWlTAPOP2NshfBVcNSXE
-  FHg4refJstCaf59iqFEWbEjLmbezK6HA5vzM6ZenEom2S1Rzj0OButABHKaISjxE
-  wJG/DZ8fJTx+Yn970cIA7jH0r03/kpg8fzrCWjUH+Jy3vX8dkTa0I+fWz45k9o1g
-  e+ENGeIRklG7T8rNCmJP6oacGJUfdmXSHDszg0u1dCi4scth1vksDbZwyL/BPqGF
-  hLvIeAXwm1TPXKvD13odTRBgHj5h7w7YOBmcqGwq+rgEC+iRJhdS00x+mquD9Gdm
-  CjCvRnS7JG4UTpmUxsdY0snPCiHZjbjCKhZr+dciOOWLQE2NVuTeiyNg5di7XMq+
-  blIh6acnMZThiR8+bHAprJ1P+DtZ6uY0oePnRZ2K1pebGIOjA/UKaHlvbatyB49z
-  NdTvAWRWAQ2tSOpQhtR/3Pp6SYniT+/lnsW3H4bBsY14wEfPp8tkp7SdbyjoEeaz
-  ljX4Qi8q0ozKO22jbtwzE6F9V/EzzwIDAQABo3MwcTAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUVLZVCCB2lbddzYxAxk/g4bfBjhQwGwYDVR0RBBQw
-  EoEQam9obkB0aHJvdHRsZS5pbzAbBgNVHRIEFDASgRBqb2huQHRocm90dGxlLmlv
-  MA0GCSqGSIb3DQEBCwUAA4IBgQAxwbDSdDZjJQ4pKoV1Xf5kj9JKL1GvJ8jotTyx
-  Oy8BXUV+iiYXCelwfvBIsBtz64pH1VVg4/xrv2Vsi3It3IUdlbxUHi5Bn0X0W9ci
-  xkQYlszu4au+oz86MY/LMx83r9y+3GKy633JH5qmILotKHgzAcoFK5mASC9QyJWV
-  EK5FWtQGVJUelB4K3P93pxICfN5os04TCW4lAzLEwYwc+TVGDa1q1u8Wr7haId4o
-  fsQvapSzlO/jXwtepH363FhrdqYnXJ1acyCGBtaHzOcRUTmgRtTwNoMQICwNzeJ+
-  VvAOtMDRJT68kz5nD1G6AyriHzLptEt2/+Oq/DmAY3E2q+qN7Rb3THDBDFV7u3Cw
-  aNcGx7j1YvV5morU/wytvIA1XvjZlp27MBu0dd4kL8k7SRApTxnRjavsDrz1Oxa6
-  BTJGZ4qddTGCNj/QRwzZegXpckYB3u60wiU6EECWndotUYuKbgObSDU4Nh1cdrzw
-  FIew3kKXPiBpZBN3eDxal56e+R0=
-  -----END CERTIFICATE-----
-date: 2020-07-30 00:00:00.000000000 Z
+cert_chain: []
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -52,61 +26,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '13.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '1.61'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '1.61'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -122,25 +110,26 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 description: Provides the ability to navigate and read entries from the systemd journal
   in ruby, as well as write events to the journal.
 email:
-- john@throttle.io
+- john@weirdhorse.party
 executables: []
-extensions: []
+extensions:
+- ext/shim/extconf.rb
 extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
@@ -151,9 +140,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- certs/john@throttle.io.pem
 - examples/journal_directory.rb
 - examples/ssh_watcher.rb
+- ext/shim/extconf.rb
+- ext/shim/shim.c
+- ext/shim/shim.h
 - lib/systemd-journal.rb
 - lib/systemd.rb
 - lib/systemd/ffi_size_t.rb
@@ -189,14 +180,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Ruby bindings to libsystemd-journal

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-�5*�rq�p�@�[��� 	k��c��
-_(*;�e&�߮L}�J��^+`u���J��9#B��͈������'D�|����ꔕ�S��*�F�.�2

data/certs/john@throttle.io.pem

@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMDCCApigAwIBAgIBATANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZqb2hu
-L0RDPXRocm90dGxlL0RDPWlvMB4XDTIwMDczMDIyMTUxNVoXDTIxMDczMDIyMTUx
-NVowITEfMB0GA1UEAwwWam9obi9EQz10aHJvdHRsZS9EQz1pbzCCAaIwDQYJKoZI
-hvcNAQEBBQADggGPADCCAYoCggGBAMEZjnWtA5/YsYEDvWlTAPOP2NshfBVcNSXE
-FHg4refJstCaf59iqFEWbEjLmbezK6HA5vzM6ZenEom2S1Rzj0OButABHKaISjxE
-wJG/DZ8fJTx+Yn970cIA7jH0r03/kpg8fzrCWjUH+Jy3vX8dkTa0I+fWz45k9o1g
-e+ENGeIRklG7T8rNCmJP6oacGJUfdmXSHDszg0u1dCi4scth1vksDbZwyL/BPqGF
-hLvIeAXwm1TPXKvD13odTRBgHj5h7w7YOBmcqGwq+rgEC+iRJhdS00x+mquD9Gdm
-CjCvRnS7JG4UTpmUxsdY0snPCiHZjbjCKhZr+dciOOWLQE2NVuTeiyNg5di7XMq+
-blIh6acnMZThiR8+bHAprJ1P+DtZ6uY0oePnRZ2K1pebGIOjA/UKaHlvbatyB49z
-NdTvAWRWAQ2tSOpQhtR/3Pp6SYniT+/lnsW3H4bBsY14wEfPp8tkp7SdbyjoEeaz
-ljX4Qi8q0ozKO22jbtwzE6F9V/EzzwIDAQABo3MwcTAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIEsDAdBgNVHQ4EFgQUVLZVCCB2lbddzYxAxk/g4bfBjhQwGwYDVR0RBBQw
-EoEQam9obkB0aHJvdHRsZS5pbzAbBgNVHRIEFDASgRBqb2huQHRocm90dGxlLmlv
-MA0GCSqGSIb3DQEBCwUAA4IBgQAxwbDSdDZjJQ4pKoV1Xf5kj9JKL1GvJ8jotTyx
-Oy8BXUV+iiYXCelwfvBIsBtz64pH1VVg4/xrv2Vsi3It3IUdlbxUHi5Bn0X0W9ci
-xkQYlszu4au+oz86MY/LMx83r9y+3GKy633JH5qmILotKHgzAcoFK5mASC9QyJWV
-EK5FWtQGVJUelB4K3P93pxICfN5os04TCW4lAzLEwYwc+TVGDa1q1u8Wr7haId4o
-fsQvapSzlO/jXwtepH363FhrdqYnXJ1acyCGBtaHzOcRUTmgRtTwNoMQICwNzeJ+
-VvAOtMDRJT68kz5nD1G6AyriHzLptEt2/+Oq/DmAY3E2q+qN7Rb3THDBDFV7u3Cw
-aNcGx7j1YvV5morU/wytvIA1XvjZlp27MBu0dd4kL8k7SRApTxnRjavsDrz1Oxa6
-BTJGZ4qddTGCNj/QRwzZegXpckYB3u60wiU6EECWndotUYuKbgObSDU4Nh1cdrzw
-FIew3kKXPiBpZBN3eDxal56e+R0=
------END CERTIFICATE-----

data.tar.gz.sig

@@ -1 +0,0 @@
-#��6�fq�Z*�/,��T\\%���`���P�R]Ż������H�il=��n,
Fxy�����Qs��#��F�0*���xn��ׂ�