From 4823d1dbc5ec8b96a5b1df1e4b4e0eee65d2782d Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Wed, 4 Feb 2015 16:14:57 +0000
Subject: Update ruby-shadow to 2.4.1.

[2014/12/02]
* Version 2.4.1
  - sp_loginclass support should NOT have been added to password implementation
[2014/12/01]
* Version 2.4.0
  - Add support for sp_loginclass via pwd.h
---
 security/ruby-shadow/Makefile                 |  6 ++----
 security/ruby-shadow/distinfo                 | 11 +++++------
 security/ruby-shadow/patches/patch-aa         | 18 ------------------
 security/ruby-shadow/patches/patch-extconf.rb | 20 +++++++++++++++-----
 4 files changed, 22 insertions(+), 33 deletions(-)
 delete mode 100644 security/ruby-shadow/patches/patch-aa

(limited to 'security')

diff --git a/security/ruby-shadow/Makefile b/security/ruby-shadow/Makefile
index 4cc6f5a73b8..d48f05245e6 100644
--- a/security/ruby-shadow/Makefile
+++ b/security/ruby-shadow/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2014/03/14 17:55:49 taca Exp $
+# $NetBSD: Makefile,v 1.6 2015/02/04 16:14:57 taca Exp $
 
-SHADOW_VER=	2.3.3
+SHADOW_VER=	2.4.1
 DISTNAME=	ruby-shadow-${SHADOW_VER}
 PKGNAME=	${RUBY_PKGPREFIX}-shadow-${SHADOW_VER}
 CATEGORIES=	databases security
@@ -13,8 +13,6 @@ USE_TOOLS+=		gmake
 
 GEM_CLEANBUILD=	Makefile *.o mkmf.log shadow.${RUBY_DLEXT} .RUBYARCHDIR.time
 
-CONFLICTS+=	ruby[1-9][0-9][0-9]-shadow-[0-9]*
-
 .include "../../lang/ruby/gem.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ruby-shadow/distinfo b/security/ruby-shadow/distinfo
index 46d6acaa4bf..a17ff9d4ce1 100644
--- a/security/ruby-shadow/distinfo
+++ b/security/ruby-shadow/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2014/07/25 16:21:26 jperkin Exp $
+$NetBSD: distinfo,v 1.5 2015/02/04 16:14:57 taca Exp $
 
-SHA1 (ruby-shadow-2.3.3.gem) = 6c1edfd710e7d2fe82faced572a5aa972a44df42
-RMD160 (ruby-shadow-2.3.3.gem) = 82a403762814d131f05c320cc24792d6447dc321
-Size (ruby-shadow-2.3.3.gem) = 10752 bytes
-SHA1 (patch-aa) = 96e1562d9772f152c312b35c48584f0de8cecb3c
-SHA1 (patch-extconf.rb) = 69b4ba8ad0416d7219231091ce2763ca64714448
+SHA1 (ruby-shadow-2.4.1.gem) = c9d9068fc11fb509618236e9bad698fac3886bae
+RMD160 (ruby-shadow-2.4.1.gem) = 287d8e21a20fa19080ca7d7819bb1e5b1f6561d0
+Size (ruby-shadow-2.4.1.gem) = 10752 bytes
+SHA1 (patch-extconf.rb) = 72f099eb7e1bd3b5cc2b16074524d5e09431029b
diff --git a/security/ruby-shadow/patches/patch-aa b/security/ruby-shadow/patches/patch-aa
deleted file mode 100644
index 95c46af65fa..00000000000
--- a/security/ruby-shadow/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2014/03/14 17:55:49 taca Exp $
-
-Relax condition to make more operating system support.
-
---- extconf.rb.orig	2014-03-06 16:01:44.000000000 +0000
-+++ extconf.rb
-@@ -16,10 +16,7 @@ $CFLAGS = case RUBY_VERSION
- implementation = case CONFIG['host_os']
-                  when /linux/i; 'shadow'
-                  when /sunos|solaris/i; 'shadow'
--                 when /freebsd|openbsd/i; 'pwd'
--                 when /darwin/i; 'pwd'
--                 else; nil
--                   "This library works on OS X, FreeBSD, OpenBSD, Solaris and Linux."
-+                 else; 'pwd'
-                  end
- 
- ok = true
diff --git a/security/ruby-shadow/patches/patch-extconf.rb b/security/ruby-shadow/patches/patch-extconf.rb
index 44c8a79e8a2..0ea1e05d3c3 100644
--- a/security/ruby-shadow/patches/patch-extconf.rb
+++ b/security/ruby-shadow/patches/patch-extconf.rb
@@ -1,15 +1,25 @@
-$NetBSD: patch-extconf.rb,v 1.1 2014/07/25 16:21:26 jperkin Exp $
+$NetBSD: patch-extconf.rb,v 1.2 2015/02/04 16:14:57 taca Exp $
 
-Do not override LDFLAGS.
+* Relax condition to make more operating system support.
+* Do not override LDFLAGS.
 
---- extconf.rb.orig	2014-07-25 16:13:16.994762284 +0000
+--- extconf.rb.orig	2015-01-26 14:06:33.000000000 +0000
 +++ extconf.rb
-@@ -26,7 +26,7 @@ when 'shadow'
+@@ -18,8 +18,7 @@ implementation = case CONFIG['host_os']
+                  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."
++                 else; 'pwd'
+                  end
+ 
+ ok = true
+@@ -29,7 +28,6 @@ when 'shadow'
    #$LDFLAGS = "-lshadow"
  
    if( ! (ok &= have_library("shadow","getspent")) )
 -    $LDFLAGS = ""
-+    #$LDFLAGS = ""
      ok = have_func("getspent")
    end
  
-- 
cgit v1.2.3