Fri Sep 10 07:49:08 2010 UTC ()
* Add LICENSE.
* Remove RUBY_HAS_ARCHLIB.
* Chante PKG_DESTDIR_SUPPORT to user-destdir.
* Add patch to support both ruby18 and ruby19.


(taca)
diff -r1.16 -r1.17 pkgsrc/security/ruby-tcpwrap/Makefile
diff -r1.4 -r1.5 pkgsrc/security/ruby-tcpwrap/distinfo
diff -r0 -r1.1 pkgsrc/security/ruby-tcpwrap/patches/patch-aa
cvs diff -r1.16 -r1.17 pkgsrc/security/ruby-tcpwrap/Makefile (expand / switch to unified diff)

--- pkgsrc/security/ruby-tcpwrap/Makefile 2009/02/15 03:27:56 1.16
+++ pkgsrc/security/ruby-tcpwrap/Makefile 2010/09/10 07:49:07 1.17
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.16 2009/02/15 03:27:56 taca Exp $ 1# $NetBSD: Makefile,v 1.17 2010/09/10 07:49:07 taca Exp $
2 2
3DISTNAME= ruby-tcpwrap-0.6 3DISTNAME= ruby-tcpwrap-0.6
4PKGNAME= ${RUBY_PKGPREFIX}-tcpwrap-0.6 4PKGNAME= ${RUBY_PKGPREFIX}-tcpwrap-0.6
5PKGREVISION= 5 5PKGREVISION= 5
6CATEGORIES= security ruby 6CATEGORIES= security ruby
7MASTER_SITES= http://www.shugo.net/archive/ruby-tcpwrap/ 7MASTER_SITES= http://www.shugo.net/archive/ruby-tcpwrap/
8 8
9MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
10HOMEPAGE= # not available 10HOMEPAGE= # not available
11COMMENT= TCP wrappers library for Ruby 11COMMENT= TCP wrappers library for Ruby
 12LICENSE= 2-clause-bsd
12 13
13RUBY_HAS_ARCHLIB= yes 14PKG_DESTDIR_SUPPORT= user-destdir
14USE_RUBY_EXTCONF= yes 15USE_RUBY_EXTCONF= yes
15WRKSRC= ${WRKDIR}/ruby-tcpwrap 16WRKSRC= ${WRKDIR}/ruby-tcpwrap
16INSTALL_TARGET= site-install 17INSTALL_TARGET= site-install
17DOCS_EN= README.en doc/tcpwrap.html.en 18DOCS_EN= README.en doc/tcpwrap.html.en
18DOCS_JA= README.ja doc/tcpwrap.html.ja 19DOCS_JA= README.ja doc/tcpwrap.html.ja
19 20
20INSTALLATION_DIRS= ${RUBY_DOC}/tcpwrap/ja ${RUBY_EG}/tcpwrap 21INSTALLATION_DIRS= ${RUBY_DOC}/tcpwrap/ja ${RUBY_EG}/tcpwrap
21PKG_DESTDIR_SUPPORT= destdir 
22 22
23post-install: 23post-install:
24 ${INSTALL_DATA} ${WRKSRC}/sample/echod.rb \ 24 ${INSTALL_DATA} ${WRKSRC}/sample/echod.rb \
25 ${DESTDIR}${PREFIX}/${RUBY_EG}/tcpwrap 25 ${DESTDIR}${PREFIX}/${RUBY_EG}/tcpwrap
26.for f in ${DOCS_EN} 26.for f in ${DOCS_EN}
27 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/tcpwrap 27 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/tcpwrap
28.endfor 28.endfor
29.for f in ${DOCS_JA} 29.for f in ${DOCS_JA}
30 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/tcpwrap/ja 30 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/tcpwrap/ja
31.endfor 31.endfor
32 32
33.include "../../lang/ruby/modules.mk" 33.include "../../lang/ruby/modules.mk"
34.include "../../security/libident/buildlink3.mk" 34.include "../../security/libident/buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/security/ruby-tcpwrap/distinfo (expand / switch to unified diff)

--- pkgsrc/security/ruby-tcpwrap/distinfo 2006/01/03 14:25:50 1.4
+++ pkgsrc/security/ruby-tcpwrap/distinfo 2010/09/10 07:49:07 1.5
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.4 2006/01/03 14:25:50 taca Exp $ 1$NetBSD: distinfo,v 1.5 2010/09/10 07:49:07 taca Exp $
2 2
3SHA1 (ruby-tcpwrap-0.6.tar.gz) = e66ce2b424db90d461686784d7b69003df76e6de 3SHA1 (ruby-tcpwrap-0.6.tar.gz) = e66ce2b424db90d461686784d7b69003df76e6de
4RMD160 (ruby-tcpwrap-0.6.tar.gz) = ebc9dad7beb4f2f222f71a252502905c61ec41e2 4RMD160 (ruby-tcpwrap-0.6.tar.gz) = ebc9dad7beb4f2f222f71a252502905c61ec41e2
5Size (ruby-tcpwrap-0.6.tar.gz) = 4504 bytes 5Size (ruby-tcpwrap-0.6.tar.gz) = 4504 bytes
 6SHA1 (patch-aa) = bde50e2d875089b149eace7a001cec7b05afe005
File Added: pkgsrc/security/ruby-tcpwrap/patches/patch-aa
$NetBSD: patch-aa,v 1.1 2010/09/10 07:49:07 taca Exp $

Use modern Ruby API.

--- tcpwrap.c.orig	2003-08-20 03:30:10.000000000 +0000
+++ tcpwrap.c
@@ -25,7 +25,12 @@
  */
 
 #include "ruby.h"
+#ifdef HAVE_RUBY_IO_H		/* Ruby 1.9 and later */
+#include "ruby/io.h"
+#else				/* Ruby 1.8.x */
 #include "rubyio.h"
+#define rb_io_stdio_file(iot)	((iot)->f)
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -101,7 +106,7 @@ static VALUE tcpd_accept(VALUE self)
     tcp_wrapper_t *tcpd;
     VALUE sock;
     int sockfd;
-    OpenFile *fptr;
+    rb_io_t *fptr;
     struct sockaddr_storage addr;
     char client_name[NI_MAXHOST] = STRING_UNKNOWN;
     char client_addr[NI_MAXHOST] = STRING_UNKNOWN;
@@ -113,7 +118,7 @@ static VALUE tcpd_accept(VALUE self)
  again:
     sock = rb_funcall(tcpd->server, rb_intern("accept"), 0);
     GetOpenFile(sock, fptr);
-    sockfd = fileno(fptr->f);
+    sockfd = fileno(rb_io_stdio_file(fptr));
     if (getpeername(sockfd, (struct sockaddr*) &addr, &len) < 0)
 	rb_sys_fail("getpeername(2)");
     error = getnameinfo((struct sockaddr*) &addr, len,
@@ -132,7 +137,7 @@ static VALUE tcpd_accept(VALUE self)
     if (tcpd->ident_lookup)
 	client_user = ident_id(sockfd, tcpd->ident_timeout);
 #endif
-    if (!hosts_ctl(RSTRING(tcpd->daemon)->ptr,
+    if (!hosts_ctl(RSTRING_PTR(tcpd->daemon),
 		   client_name,
 		   client_addr,
 		   (client_user == NULL) ? STRING_UNKNOWN : client_user)) {
@@ -156,8 +161,8 @@ tcpd_s_set_hosts_allow(VALUE self, VALUE
 {
     static char hosts_allow[MAXPATHLEN];
 
-    Check_SafeStr(s);
-    snprintf(hosts_allow, sizeof(hosts_allow), "%s", RSTRING(s)->ptr);
+    SafeStringValue(s);
+    snprintf(hosts_allow, sizeof(hosts_allow), "%s", RSTRING_PTR(s));
     if(access(hosts_allow, R_OK) < 0)
 	rb_warning("cannot read %s", hosts_allow);
     hosts_allow_table = hosts_allow;
@@ -176,8 +181,8 @@ tcpd_s_set_hosts_deny(VALUE self, VALUE 
 {
     static char hosts_deny[MAXPATHLEN];
 
-    Check_SafeStr(s);
-    snprintf(hosts_deny, sizeof(hosts_deny), "%s", RSTRING(s)->ptr);
+    SafeStringValue(s);
+    snprintf(hosts_deny, sizeof(hosts_deny), "%s", RSTRING_PTR(s));
     if(access(hosts_deny, R_OK) < 0)
 	rb_warning("cannot read %s", hosts_deny);
     hosts_deny_table = hosts_deny;
@@ -196,7 +201,7 @@ str_to_ctlstr(VALUE s)
 {
     if(NIL_P(s)) return STRING_UNKNOWN;
     Check_Type(s, T_STRING);
-    return RSTRING(s)->ptr;
+    return RSTRING_PTR(s);
 }
 
 static VALUE