ruby-shadow: update and supply extconf.rb

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

3 files changed, 118 insertions, 4 deletions

diff --git a/recipes-support/ruby-shadow/files/0001-shadow-update-to-ruby-3.x-str-routines.patch b/recipes-support/ruby-shadow/files/0001-shadow-update-to-ruby-3.x-str-routines.patch
new file mode 100644
index 0000000..4c5591d
--- /dev/null
+++ b/recipes-support/ruby-shadow/files/0001-shadow-update-to-ruby-3.x-str-routines.patch
@@ -0,0 +1,30 @@
+From 781c51f6bc5da29ca879de42efa55128b04d5772 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Fri, 11 Oct 2024 03:34:40 +0000
+Subject: [PATCH] shadow: update to ruby 3.x str routines
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ shadow/shadow.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/shadow/shadow.c b/shadow/shadow.c
+index 35a77a1..314c280 100644
+--- a/shadow/shadow.c
++++ b/shadow/shadow.c
+@@ -34,8 +34,8 @@ static VALUE rb_eFileLock;
+ static VALUE convert_pw_struct( struct spwd *entry ) 
+ {
+   return rb_struct_new(rb_sPasswdEntry,
+-                     rb_tainted_str_new2(entry->sp_namp),
+-                     rb_tainted_str_new2(entry->sp_pwdp),
++                     rb_str_new_cstr(entry->sp_namp),
++                     rb_str_new_cstr(entry->sp_pwdp),
+                      INT2FIX(entry->sp_lstchg),
+                      INT2FIX(entry->sp_min),
+                      INT2FIX(entry->sp_max),
+-- 
+2.39.2
+
diff --git a/recipes-support/ruby-shadow/files/extconf.rb b/recipes-support/ruby-shadow/files/extconf.rb
new file mode 100644
index 0000000..570a6ee
--- /dev/null
+++ b/recipes-support/ruby-shadow/files/extconf.rb
@@ -0,0 +1,75 @@
+#                                          -*- ruby -*-
+# extconf.rb
+#
+# Modified at: <1999/8/19 06:38:55 by ttate>
+#
+
+require 'mkmf'
+require 'rbconfig'
+
+$CFLAGS = case RUBY_VERSION
+          when /^1\.9/; '-DRUBY19'
+          when /^2\./; '-DRUBY19'
+          when /^3\./; '-DRUBY19'
+          else; ''
+          end
+
+implementation = case CONFIG['host_os']
+                 when /linux/i; 'shadow'
+                 when /sunos|solaris/i; 'shadow'
+                 when /freebsd|mirbsd|netbsd|openbsd/i; 'pwd'
+                 when /darwin/i; 'pwd'
+                 else; nil
+                   "This library works on OS X, FreeBSD, MirBSD, NetBSD, OpenBSD, Solaris and Linux."
+                 end
+
+# force this, we know we are building for linux
+implementation = 'shadow'
+
+# puts "Selected implementation: #{implementation}"
+# puts "Host OS: #{CONFIG['host_os']}"
+
+ok = true
+
+case implementation
+when 'shadow'
+  #$LDFLAGS = "-lshadow"
+
+  if( ! (ok &= have_library("shadow","getspent")) )
+    $LDFLAGS = ""
+    ok = have_func("getspent")
+  end
+
+  ok &= have_func("fgetspent")
+  ok &= have_func("setspent")
+  ok &= have_func("endspent")
+  ok &= have_func("lckpwdf")
+  ok &= have_func("ulckpwdf")
+
+  if ok
+    if !have_func("sgetspent")
+      $CFLAGS += ' -DSOLARIS'
+    end
+  end
+when 'pwd'
+  ok &= have_func("endpwent")
+  ok &= have_func("getpwent")
+  ok &= have_func("getpwnam")
+  ok &= have_func("getpwuid")
+  ok &= have_func("setpassent")
+  ok &= have_func("setpwent")
+
+  have_header("uuid/uuid.h")
+  have_header("uuid.h")
+else
+  ok = false
+end
+
+have_header( "ruby/io.h")
+
+if ok
+
+  create_makefile("shadow", implementation)
+else
+  raise "You are missing some of the required functions from either shadow.h on Linux/Solaris, or pwd.h on FreeBSD/MirBSD/NetBSD/OpenBSD/OS X."
+end
diff --git a/recipes-support/ruby-shadow/ruby-shadow_git.bb b/recipes-support/ruby-shadow/ruby-shadow_git.bb
index 0c6fc60..9a82a5b 100644
--- a/recipes-support/ruby-shadow/ruby-shadow_git.bb
+++ b/recipes-support/ruby-shadow/ruby-shadow_git.bb
@@ -1,18 +1,25 @@
 SUMMARY = "Shadow Password Module"
 HOMEPAGE = "https://github.com/apalmblad/ruby-shadow"
 LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=137882914e5269b7268f0fe8e28a3f89"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=eee512aef6667f19c00b841db708cfeb"
 
-PV = "2.5.0"
+PV = "2.5.1"
 
-SRC_URI = "git://github.com/apalmblad/ruby-shadow.git;branch=master;protocol=https"
-SRCREV = "d2e822d8a8bda61f0774debbfce363a7347ed893"
+SRC_URI = "git://github.com/apalmblad/ruby-shadow.git;branch=master;protocol=https \
+           file://0001-shadow-update-to-ruby-3.x-str-routines.patch \
+           file://extconf.rb"
+
+SRCREV = "f135b3fd52d0a638f2eb9b17a8952a7f0f317688"
 S = "${WORKDIR}/git"
 
 inherit ruby
 
+GEM_NAME = "ruby-shadow"
+GEM_SPEC_FILE = "ruby-shadow.gemspec"
+
 DEPENDS += " \
         ruby \
+        shadow \
 "
 
 RDEPENDS:${PN} += " \
@@ -21,3 +28,5 @@ RDEPENDS:${PN} += " \
 
 RUBY_INSTALL_GEMS = "ruby-shadow-${PV}.gem"
 FILES:${PN}-dbg += "/usr/lib*/ruby/gems/*/gems/ruby-shadow-${PV}/.debug/shadow.so"
+
+INSANE_SKIP:${PN} += "ldflags textrel"