diff options
author | taca <taca@pkgsrc.org> | 2010-09-10 07:49:07 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2010-09-10 07:49:07 +0000 |
commit | ad104dc8409d51743fb1a1b7ad0d992012e08ec5 (patch) | |
tree | 9ed69188a08dc2d8a0ca2b0c3994ede5e3aa5aa0 /security | |
parent | 24346df41dd8a0a26178c51fcf9f385865d9a3e8 (diff) | |
download | pkgsrc-ad104dc8409d51743fb1a1b7ad0d992012e08ec5.tar.gz |
* Add LICENSE.
* Remove RUBY_HAS_ARCHLIB.
* Chante PKG_DESTDIR_SUPPORT to user-destdir.
* Add patch to support both ruby18 and ruby19.
Diffstat (limited to 'security')
-rw-r--r-- | security/ruby-tcpwrap/Makefile | 6 | ||||
-rw-r--r-- | security/ruby-tcpwrap/distinfo | 3 | ||||
-rw-r--r-- | security/ruby-tcpwrap/patches/patch-aa | 77 |
3 files changed, 82 insertions, 4 deletions
diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile index 1795cf5999f..20429be7f8e 100644 --- a/security/ruby-tcpwrap/Makefile +++ b/security/ruby-tcpwrap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2009/02/15 03:27:56 taca Exp $ +# $NetBSD: Makefile,v 1.17 2010/09/10 07:49:07 taca Exp $ DISTNAME= ruby-tcpwrap-0.6 PKGNAME= ${RUBY_PKGPREFIX}-tcpwrap-0.6 @@ -9,8 +9,9 @@ MASTER_SITES= http://www.shugo.net/archive/ruby-tcpwrap/ MAINTAINER= taca@NetBSD.org HOMEPAGE= # not available COMMENT= TCP wrappers library for Ruby +LICENSE= 2-clause-bsd -RUBY_HAS_ARCHLIB= yes +PKG_DESTDIR_SUPPORT= user-destdir USE_RUBY_EXTCONF= yes WRKSRC= ${WRKDIR}/ruby-tcpwrap INSTALL_TARGET= site-install @@ -18,7 +19,6 @@ DOCS_EN= README.en doc/tcpwrap.html.en DOCS_JA= README.ja doc/tcpwrap.html.ja INSTALLATION_DIRS= ${RUBY_DOC}/tcpwrap/ja ${RUBY_EG}/tcpwrap -PKG_DESTDIR_SUPPORT= destdir post-install: ${INSTALL_DATA} ${WRKSRC}/sample/echod.rb \ diff --git a/security/ruby-tcpwrap/distinfo b/security/ruby-tcpwrap/distinfo index b49cf689645..17167aaf476 100644 --- a/security/ruby-tcpwrap/distinfo +++ b/security/ruby-tcpwrap/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.4 2006/01/03 14:25:50 taca Exp $ +$NetBSD: distinfo,v 1.5 2010/09/10 07:49:07 taca Exp $ SHA1 (ruby-tcpwrap-0.6.tar.gz) = e66ce2b424db90d461686784d7b69003df76e6de RMD160 (ruby-tcpwrap-0.6.tar.gz) = ebc9dad7beb4f2f222f71a252502905c61ec41e2 Size (ruby-tcpwrap-0.6.tar.gz) = 4504 bytes +SHA1 (patch-aa) = bde50e2d875089b149eace7a001cec7b05afe005 diff --git a/security/ruby-tcpwrap/patches/patch-aa b/security/ruby-tcpwrap/patches/patch-aa new file mode 100644 index 00000000000..a39936dd86e --- /dev/null +++ b/security/ruby-tcpwrap/patches/patch-aa @@ -0,0 +1,77 @@ +$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 |