Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/ruby-tcpwrap/, dev-ruby/ruby-tcpwrap/files/
Date: Wed, 31 May 2017 04:38:46
Message-Id: 1496204660.207a26e68f8f3c6c2931d8a24c76d674c1d49312.graaff@gentoo
1 commit: 207a26e68f8f3c6c2931d8a24c76d674c1d49312
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 31 04:22:16 2017 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Wed May 31 04:24:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=207a26e6
7
8 remove masked dev-ruby/ruby-tcpwrap
9
10 dev-ruby/ruby-tcpwrap/Manifest | 1 -
11 .../files/ruby-tcpwrap-0.6-ruby19.patch | 83 ----------------------
12 dev-ruby/ruby-tcpwrap/metadata.xml | 8 ---
13 dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild | 54 --------------
14 4 files changed, 146 deletions(-)
15
16 diff --git a/dev-ruby/ruby-tcpwrap/Manifest b/dev-ruby/ruby-tcpwrap/Manifest
17 deleted file mode 100644
18 index ef16c4cf22a..00000000000
19 --- a/dev-ruby/ruby-tcpwrap/Manifest
20 +++ /dev/null
21 @@ -1 +0,0 @@
22 -DIST ruby-tcpwrap-0.6.tar.gz 4504 SHA256 b896dc36d41951ba5e3f769d1ad5a246b1f559d58f6435966ebe1d4d369996ea SHA512 51385f6a1cbcb18ce5866d5c2edd3388891835781f66d22558ad72e9dbb4639f376b5cae8a2890289b4d2cfbd4fb4f42d45c13b596372601ff57b6f1638ca6c1 WHIRLPOOL eaa402a06726fd0bd125fbb49af5c82676cbef62a736d15a343c63f6f2deedc485a548cf2bf76759f3de7b192769f80f1715df7a65cc35ea18c2c4176a6131e5
23
24 diff --git a/dev-ruby/ruby-tcpwrap/files/ruby-tcpwrap-0.6-ruby19.patch b/dev-ruby/ruby-tcpwrap/files/ruby-tcpwrap-0.6-ruby19.patch
25 deleted file mode 100644
26 index 3f30d592a22..00000000000
27 --- a/dev-ruby/ruby-tcpwrap/files/ruby-tcpwrap-0.6-ruby19.patch
28 +++ /dev/null
29 @@ -1,83 +0,0 @@
30 -diff -Naur ruby-tcpwrap.orig//tcpwrap.c ruby-tcpwrap//tcpwrap.c
31 ---- ruby-tcpwrap.orig//tcpwrap.c 2003-08-20 12:30:10.000000000 +0900
32 -+++ ruby-tcpwrap//tcpwrap.c 2010-05-28 08:08:49.000000000 +0900
33 -@@ -25,7 +25,11 @@
34 - */
35 -
36 - #include "ruby.h"
37 -+#ifdef HAVE_RUBY_IO_H
38 -+#include "ruby/io.h"
39 -+#else
40 - #include "rubyio.h"
41 -+#endif
42 - #include <sys/types.h>
43 - #include <sys/socket.h>
44 - #include <netinet/in.h>
45 -@@ -46,6 +50,10 @@
46 -
47 - #define DEFAULT_RFC1413_QUERY_TIMEOUT 30
48 -
49 -+#ifndef RSTRING_PTR
50 -+#define RSTRING_PTR(str) RSTRING(str)->ptr
51 -+#endif
52 -+
53 - int allow_severity = 0;
54 - int deny_severity = 0;
55 -
56 -@@ -101,7 +109,7 @@
57 - tcp_wrapper_t *tcpd;
58 - VALUE sock;
59 - int sockfd;
60 -- OpenFile *fptr;
61 -+ rb_io_t *fptr;
62 - struct sockaddr_storage addr;
63 - char client_name[NI_MAXHOST] = STRING_UNKNOWN;
64 - char client_addr[NI_MAXHOST] = STRING_UNKNOWN;
65 -@@ -113,7 +121,11 @@
66 - again:
67 - sock = rb_funcall(tcpd->server, rb_intern("accept"), 0);
68 - GetOpenFile(sock, fptr);
69 -+#ifdef HAVE_RUBY_IO_H
70 -+ sockfd = fileno(fptr->fd);
71 -+#else
72 - sockfd = fileno(fptr->f);
73 -+#endif
74 - if (getpeername(sockfd, (struct sockaddr*) &addr, &len) < 0)
75 - rb_sys_fail("getpeername(2)");
76 - error = getnameinfo((struct sockaddr*) &addr, len,
77 -@@ -132,7 +144,7 @@
78 - if (tcpd->ident_lookup)
79 - client_user = ident_id(sockfd, tcpd->ident_timeout);
80 - #endif
81 -- if (!hosts_ctl(RSTRING(tcpd->daemon)->ptr,
82 -+ if (!hosts_ctl(RSTRING_PTR(tcpd->daemon),
83 - client_name,
84 - client_addr,
85 - (client_user == NULL) ? STRING_UNKNOWN : client_user)) {
86 -@@ -157,7 +169,7 @@
87 - static char hosts_allow[MAXPATHLEN];
88 -
89 - Check_SafeStr(s);
90 -- snprintf(hosts_allow, sizeof(hosts_allow), "%s", RSTRING(s)->ptr);
91 -+ snprintf(hosts_allow, sizeof(hosts_allow), "%s", RSTRING_PTR(s));
92 - if(access(hosts_allow, R_OK) < 0)
93 - rb_warning("cannot read %s", hosts_allow);
94 - hosts_allow_table = hosts_allow;
95 -@@ -177,7 +189,7 @@
96 - static char hosts_deny[MAXPATHLEN];
97 -
98 - Check_SafeStr(s);
99 -- snprintf(hosts_deny, sizeof(hosts_deny), "%s", RSTRING(s)->ptr);
100 -+ snprintf(hosts_deny, sizeof(hosts_deny), "%s", RSTRING_PTR(s));
101 - if(access(hosts_deny, R_OK) < 0)
102 - rb_warning("cannot read %s", hosts_deny);
103 - hosts_deny_table = hosts_deny;
104 -@@ -196,7 +208,7 @@
105 - {
106 - if(NIL_P(s)) return STRING_UNKNOWN;
107 - Check_Type(s, T_STRING);
108 -- return RSTRING(s)->ptr;
109 -+ return RSTRING_PTR(s);
110 - }
111 -
112 - static VALUE
113
114 diff --git a/dev-ruby/ruby-tcpwrap/metadata.xml b/dev-ruby/ruby-tcpwrap/metadata.xml
115 deleted file mode 100644
116 index 28ab0c15f20..00000000000
117 --- a/dev-ruby/ruby-tcpwrap/metadata.xml
118 +++ /dev/null
119 @@ -1,8 +0,0 @@
120 -<?xml version="1.0" encoding="UTF-8"?>
121 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
122 -<pkgmetadata>
123 -<maintainer type="project">
124 - <email>ruby@g.o</email>
125 - <name>Gentoo Ruby Project</name>
126 -</maintainer>
127 -</pkgmetadata>
128
129 diff --git a/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild b/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild
130 deleted file mode 100644
131 index a03a32e26eb..00000000000
132 --- a/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild
133 +++ /dev/null
134 @@ -1,54 +0,0 @@
135 -# Copyright 1999-2017 Gentoo Foundation
136 -# Distributed under the terms of the GNU General Public License v2
137 -
138 -EAPI=5
139 -
140 -# ruby22 -> Does not compile
141 -USE_RUBY="ruby21"
142 -
143 -inherit ruby-ng
144 -
145 -DESCRIPTION="A TCP wrappers library for Ruby"
146 -HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=ruby-tcpwrap"
147 -SRC_URI="http://shugo.net/archive/ruby-tcpwrap/${P}.tar.gz"
148 -
149 -LICENSE="BSD"
150 -SLOT="0"
151 -KEYWORDS="amd64 ~hppa ~mips ~ppc x86"
152 -IUSE=""
153 -
154 -DEPEND+=" net-libs/libident
155 - sys-apps/tcp-wrappers"
156 -
157 -RDEPEND+=" net-libs/libident
158 - sys-apps/tcp-wrappers"
159 -
160 -RUBY_S="${PN}"
161 -RUBY_PATCHES=( "${P}-ruby19.patch" )
162 -
163 -each_ruby_configure() {
164 - ${RUBY} extconf.rb || die "extconf.rb failed"
165 -}
166 -
167 -each_ruby_compile() {
168 - # We have injected --no-undefined in Ruby as a safety precaution
169 - # against broken ebuilds, but the Ruby-Gnome bindings
170 - # unfortunately rely on the lazy load of other extensions; see bug
171 - # #320545.
172 - find . -name Makefile -print0 | xargs -0 \
173 - sed -i -e 's:-Wl,--no-undefined ::' || die "--no-undefined removal failed"
174 -
175 - emake V=1
176 -}
177 -
178 -each_ruby_install() {
179 - emake DESTDIR="${D}" install V=1
180 -}
181 -
182 -all_ruby_install() {
183 - dodoc README*
184 - dohtml doc/*
185 -
186 - docinto sample
187 - dodoc sample/*
188 -}