Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Dec 2022 09:18:13 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b44eac0040df - main - www/rubygem-fcgi: Update to 0.9.2.2
Message-ID:  <202212300918.2BU9IDIc026767@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b44eac0040df6a8e0ddc1cb3ae4d621622d48911

commit b44eac0040df6a8e0ddc1cb3ae4d621622d48911
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-12-30 08:54:10 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-12-30 09:06:24 +0000

    www/rubygem-fcgi: Update to 0.9.2.2
    
    Changes:        https://github.com/alphallc/ruby-fcgi-ng/commits/master
---
 www/rubygem-fcgi/Makefile           |   5 +-
 www/rubygem-fcgi/distinfo           |   5 +-
 www/rubygem-fcgi/files/patch-fcgi.c | 157 ------------------------------------
 3 files changed, 5 insertions(+), 162 deletions(-)

diff --git a/www/rubygem-fcgi/Makefile b/www/rubygem-fcgi/Makefile
index 0ec0b3642d22..91693804e7b6 100644
--- a/www/rubygem-fcgi/Makefile
+++ b/www/rubygem-fcgi/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	fcgi
-PORTVERSION=	0.9.2.1
-PORTREVISION=	1
+PORTVERSION=	0.9.2.2
 CATEGORIES=	www ruby
 MASTER_SITES=	RG
 
@@ -12,7 +11,7 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libfcgi.so:www/fcgi
 
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-fcgi/distinfo b/www/rubygem-fcgi/distinfo
index 8cfed1e1f7dd..b1d5b7e94b05 100644
--- a/www/rubygem-fcgi/distinfo
+++ b/www/rubygem-fcgi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/fcgi-0.9.2.1.gem) = f5e18b6769dfea1760e3da1dae1df7ade140cd5c1394e9318e36d9834f13ca1e
-SIZE (rubygem/fcgi-0.9.2.1.gem) = 15872
+TIMESTAMP = 1669058425
+SHA256 (rubygem/fcgi-0.9.2.2.gem) = 0be03c012267ad192c4367871b41dda66204992c5f885011e61ad4ca03dd0dc0
+SIZE (rubygem/fcgi-0.9.2.2.gem) = 15872
diff --git a/www/rubygem-fcgi/files/patch-fcgi.c b/www/rubygem-fcgi/files/patch-fcgi.c
deleted file mode 100644
index defd67bf7a37..000000000000
--- a/www/rubygem-fcgi/files/patch-fcgi.c
+++ /dev/null
@@ -1,157 +0,0 @@
---- ext/fcgi/fcgi.c.orig	2022-05-09 10:44:18 UTC
-+++ ext/fcgi/fcgi.c
-@@ -131,8 +131,10 @@ static VALUE fcgi_s_accept(VALUE self)
-       while( *(pvalue++) != '=') size++;
-       key   = rb_str_new(pkey, size);
-       value = rb_str_new2(pvalue);
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-       OBJ_TAINT(key);
-       OBJ_TAINT(value);
-+#endif
-       rb_hash_aset(data->env, key, value);
-     }
- 
-@@ -262,7 +264,9 @@ static VALUE fcgi_stream_putc(VALUE self, VALUE ch)
-   FCGX_Stream *stream;
-   int c;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   rb_secure(4);
-+#endif
-   Data_Get_Stream(self, stream);
-   if ((c = FCGX_PutChar(NUM2INT(ch), stream)) == EOF)
-     CHECK_STREAM_ERROR(stream);
-@@ -274,7 +278,9 @@ static VALUE fcgi_stream_write(VALUE self, VALUE str)
-   FCGX_Stream *stream;
-   int len;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   rb_secure(4);
-+#endif
-   Data_Get_Stream(self, stream);
-   str = rb_obj_as_string(str);
-   len = FCGX_PutStr(RSTRING_PTR(str), RSTRING_LEN(str), stream);
-@@ -407,9 +413,11 @@ static VALUE fcgi_stream_ungetc(VALUE self, VALUE ch)
-   FCGX_Stream *stream;
-   int c;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-   }
-+#endif
-   Data_Get_Stream(self, stream);
-   c = FCGX_UnGetChar(NUM2INT(ch), stream);
-   CHECK_STREAM_ERROR(stream);
-@@ -420,11 +428,13 @@ static VALUE fcgi_stream_gets(VALUE self) {
-   FCGX_Stream *stream;
-   char buff[BUFSIZ];
-   VALUE str = rb_str_new(0,0);
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   OBJ_TAINT(str);
- 
-   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-   }
-+#endif
- 
-   Data_Get_Stream(self, stream);
- 
-@@ -449,9 +459,11 @@ static VALUE fcgi_stream_read(int argc, VALUE *argv, V
-   char *buff;
-   int n;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-   }
-+#endif
- 
-   Data_Get_Stream(self, stream);
- 
-@@ -464,7 +476,9 @@ static VALUE fcgi_stream_read(int argc, VALUE *argv, V
-       return  Qnil;
-     }
-     str = rb_str_new(buff, n);
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     OBJ_TAINT(str);
-+#endif
- 
-     while(!FCGX_HasSeenEOF(stream)) {
-       n = FCGX_GetStr(buff, 16384, stream);
-@@ -488,7 +502,9 @@ static VALUE fcgi_stream_read(int argc, VALUE *argv, V
-   CHECK_STREAM_ERROR(stream);
-   if (n > 0) {
-     str = rb_str_new(buff, n);
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     OBJ_TAINT(str);
-+#endif
-     free(buff);
-     return str;
-   }
-@@ -502,9 +518,11 @@ static VALUE fcgi_stream_eof(VALUE self)
- {
-   FCGX_Stream *stream;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-   }
-+#endif
-   Data_Get_Stream(self, stream);
-   return FCGX_HasSeenEOF(stream) ? Qtrue : Qfalse;
- }
-@@ -513,9 +531,11 @@ static VALUE fcgi_stream_close(VALUE self)
- {
-   FCGX_Stream *stream;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-     rb_raise(rb_eSecurityError, "Insecure: can't close");
-   }
-+#endif
-   Data_Get_Stream(self, stream);
-   if (FCGX_FClose(stream) == EOF)
-     CHECK_STREAM_ERROR(stream);
-@@ -532,33 +552,41 @@ static VALUE fcgi_stream_closed(VALUE self)
- 
- static VALUE fcgi_stream_binmode(VALUE self)
- {
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-   }
-+#endif
-   return self;
- }
- 
- static VALUE fcgi_stream_isatty(VALUE self)
- {
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-   }
-+#endif
-   return Qfalse;
- }
- 
- static VALUE fcgi_stream_sync(VALUE self)
- {
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-   }
-+#endif
-   return Qfalse;
- }
- 
- static VALUE fcgi_stream_setsync(VALUE self,VALUE sync)
- {
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-   if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
-     rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
-   }
-+#endif
-   return Qfalse;
- }
- 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212300918.2BU9IDIc026767>