capng_c 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2282b438c73cafe667183986b8beef357b3d397eff60249658f94d71326cafc8
-  data.tar.gz: 8bb3439b3e3934efe4e83bda4e256780f4c7bb718a7f4883bc33d530483b5813
+  metadata.gz: bce3b9c0ad260ea018498a3b20f5906b79f8796cb791ba05417071ab9dfa32f4
+  data.tar.gz: e324f852c0f4433aa9572b2bfda44f4ab3b59ac0d8afb77fadd13ac9f76f53a8
 SHA512:
-  metadata.gz: d24ec898c4b40f26cee597a369f10c4ada7973fdba6c4cb51e85812702f2d6684b83e69946e4f019d94ff595380663150d4af1833b99e0f84cba99599a579110
-  data.tar.gz: d077c6cbbc46950174bbd6e0c2cbf296ac679b69a2231f560de846203718d562c920b53343db7d2dde48bd484cbcf3b50904c763f37ae99d330616bac0c015b1
+  metadata.gz: 45162d9090edd42d30626a9832ef1c970c45f78dfa3a77f7fea5a1184881d8a22bfaa0cc3c6e25eaf66e461cf1b09557a655b05b3789dcc9bd5a6f195b31e6b0
+  data.tar.gz: 1c4c28132d99e46afc10c49a5dcba7574e904ffa357bfca622da34bdf8e4ed614a8daecbb5144b1d756ba65b857176ede2bbd562c808d8660cd776d635e4ea6d

data/.github/workflows/apt.yml

@@ -9,12 +9,12 @@ jobs:
       fail-fast: false
       matrix:
         label:
-          - Debian GNU/Linux Buster amd64
+          - Debian GNU/Linux Bookworm amd64
           - Ubuntu Bionic amd64
           - Ubuntu Focal amd64
         include:
-          - label: Debian GNU/Linux Buster amd64
-            test-docker-image: debian:buster
+          - label: Debian GNU/Linux Bookworm amd64
+            test-docker-image: debian:bookworm
             test-script: ci/apt-test.sh
           - label: Ubuntu Bionic amd64
             test-docker-image: ubuntu:bionic

data/.github/workflows/linux.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.4', '2.5', '2.6' , '2.7' ]
+        ruby: [ '2.5', '2.6' , '2.7', '3.0', '3.1', '3.2', '3.3', '3.4' ]
         os:
           - ubuntu-latest
     name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
@@ -25,6 +25,5 @@ jobs:
       env:
         CI: true
       run: |
-        gem install bundler rake
         bundle install --jobs 4 --retry 3
-        bundle exec rake
+        bundle exec rake

data/.github/workflows/yum.yml

@@ -9,16 +9,16 @@ jobs:
       fail-fast: false
       matrix:
         label:
-          - CentOS 7 x86_64
-          - CentOS 8 x86_64
+          - RockyLinux 8 x86_64
+          - AlmaLinux 9 x86_64
           - Fedora 33 x86_64
           - AmazonLinux 2 x86_64
         include:
-          - label: CentOS 7 x86_64
-            test-docker-image: centos:7
+          - label: RockyLinux 8 x86_64
+            test-docker-image: rockylinux:8
             test-script: ci/yum-test.sh
-          - label: CentOS 8 x86_64
-            test-docker-image: centos:8
+          - label: AlmaLinux 9 x86_64
+            test-docker-image: almalinux:9
             test-script: ci/yum-test.sh
           - label: Fedora 33 x86_64
             test-docker-image: fedora:33
@@ -36,4 +36,4 @@ jobs:
           --tty \
           --volume ${PWD}:/capng \
           ${{ matrix.test-docker-image }} \
-          /capng/${{ matrix.test-script }}
+          /capng/${{ matrix.test-script }}

data/Rakefile

@@ -12,9 +12,7 @@ end
 
 require "rake/extensiontask"
 
-spec = eval File.read("capng_c.gemspec")
-
-Rake::ExtensionTask.new("capng", spec) do |ext|
+Rake::ExtensionTask.new("capng") do |ext|
   ext.lib_dir = "lib/capng"
 end
 

data/ci/apt-test.sh

@@ -7,9 +7,9 @@ export DEBIAN_FRONTEND=noninteractive
 apt update
 apt install -V -y lsb-release
 
-apt install -V -y ruby-dev git build-essential pkg-config
+apt install -V -y ruby-dev git build-essential pkg-config libyaml-dev
 apt install -V -y libcap-ng-dev
 cd /capng && \
-    gem install bundler --no-document && \
+    gem install bundler -v 2.3.27 --no-document && \
     bundle install && \
     bundle exec rake

data/ci/yum-test.sh

@@ -34,6 +34,12 @@ case ${distribution} in
         ;;
     esac
     ;;
+  rocky)
+    DNF="dnf --enablerepo=powertools"
+    ;;
+  almalinux)
+    DNF="dnf --enablerepo=crb"
+    ;;
 esac
 
 ${DNF} groupinstall -y "Development Tools"
@@ -53,6 +59,7 @@ else
            rubygems \
            rpm-build
 fi
+${DNF} install -y libyaml-devel
 ${DNF} install -y libcap-ng-devel
 
 if [ $USE_SCL -eq 1 ]; then
@@ -60,5 +67,5 @@ if [ $USE_SCL -eq 1 ]; then
     export MANPATH=
     cd /capng && source /opt/rh/rh-ruby26/enable && gem install bundler --no-document && bundle install && bundle exec rake
 else
-    cd /capng && gem install bundler --no-document && bundle install && bundle exec rake
+    cd /capng && gem install bundler -v 2.3.27 --no-document && bundle install && bundle exec rake
 fi

data/ext/capng/capng.c

@@ -67,6 +67,19 @@ rb_capng_alloc(VALUE klass)
   return obj;
 }
 
+static int
+capng_get_file_descriptor(VALUE rb_file)
+{
+#ifdef HAVE_RB_IO_DESCRIPTOR
+  return rb_io_descriptor(rb_file);
+#else
+  rb_io_t* fptr = NULL;
+
+  fptr = RFILE(rb_file)->fptr;
+  return fptr->fd;
+#endif
+}
+
 /*
  * Initalize CapNG class.
  *
@@ -500,15 +513,13 @@ static VALUE
 rb_capng_get_caps_file(VALUE self, VALUE rb_file)
 {
   int result = 0, fd = 0;
-  rb_io_t* fptr = NULL;
 
   Check_Type(rb_file, T_FILE);
 
   if (NIL_P(rb_file)) {
     return Qfalse;
   }
-  fptr = RFILE(rb_file)->fptr;
-  fd = fptr->fd;
+  fd = capng_get_file_descriptor(rb_file);
   result = capng_get_caps_fd(fd);
 
   if (result == 0)
@@ -529,7 +540,6 @@ static VALUE
 rb_capng_apply_caps_file(VALUE self, VALUE rb_file)
 {
   int result = 0, fd = 0;
-  rb_io_t* fptr = NULL;
 
   Check_Type(rb_file, T_FILE);
 
@@ -537,8 +547,7 @@ rb_capng_apply_caps_file(VALUE self, VALUE rb_file)
     return Qfalse;
   }
 
-  fptr = RFILE(rb_file)->fptr;
-  fd = fptr->fd;
+  fd = capng_get_file_descriptor(rb_file);
   result = capng_apply_caps_fd(fd);
 
   if (result == 0)

data/ext/capng/extconf.rb

@@ -20,6 +20,10 @@ includedir = RbConfig::CONFIG["includedir"]
 
 dir_config("capng", includedir, libdir)
 
+unless find_executable("pkg-config")
+  raise "Require pkg-config due to install capng_c gem. Please install pkg-config."
+end
+
 pkg_config("libcap-ng")
 $CFLAGS << " -Wall -std=c99 -fPIC "
 # $CFLAGS << " -g -O0"
@@ -29,5 +33,6 @@ have_const("CAPNG_SELECT_ALL", "cap-ng.h")
 have_const("CAPNG_AMBIENT", "cap-ng.h")
 have_const("CAPNG_INIT_SUPP_GRP", "cap-ng.h")
 have_func("rb_sym2str", "ruby.h")
+have_func("rb_io_descriptor", "ruby.h")
 have_func("capng_get_caps_fd", "cap-ng.h")
 create_makefile("capng/capng")

data/ext/capng/print.c

@@ -129,8 +129,11 @@ rb_capng_print_caps_text(VALUE self, VALUE rb_where_name_or_type,
       result = capng_print_caps_text(CAPNG_PRINT_BUFFER, capability_type);
   }
 
-  if (result)
-    return rb_str_new2(result);
+  if (result) {
+    VALUE obj = rb_str_new2(result);
+    free(result);
+    return obj;
+  }
   else
     return rb_str_new2("none");
 }
@@ -191,8 +194,11 @@ rb_capng_print_caps_numeric(VALUE self, VALUE rb_where_name_or_type,
       result = capng_print_caps_numeric(CAPNG_PRINT_BUFFER, select);
   }
 
-  if (result)
-    return rb_str_new2(result);
+  if (result) {
+    VALUE obj = rb_str_new2(result);
+    free(result);
+    return obj;
+  }
   else
     return rb_str_new2("none");
 }

data/lib/capng/version.rb

@@ -1,3 +1,3 @@
 class CapNG
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: capng_c
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Hiroshi Hatake
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +133,6 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/fluent-plugins-nursery/capng_c
   source_code_uri: https://github.com/fluent-plugins-nursery/capng_c
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: libcap-ng bindings for Ruby.
 test_files: []