FreeBSD Bugzilla – Attachment 155308 Details for
Bug 199267
[PATCH] security/ruby-camellia: fix build error
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to fix the build error.
ruby-camellia.patch (text/plain), 3.15 KB, created by
Yoshisato Yanagisawa
on 2015-04-07 15:59:31 UTC
(
hide
)
Description:
patch to fix the build error.
Filename:
MIME Type:
Creator:
Yoshisato Yanagisawa
Created:
2015-04-07 15:59:31 UTC
Size:
3.15 KB
patch
obsolete
>diff -ruN /usr/ports/security/ruby-camellia/Makefile ruby-camellia/Makefile >--- /usr/ports/security/ruby-camellia/Makefile 2015-04-04 21:04:22.000000000 +0900 >+++ ruby-camellia/Makefile 2015-04-08 00:43:50.000000000 +0900 >@@ -12,6 +12,9 @@ > MAINTAINER= osho@pcc-software.org > COMMENT= Ruby extension library which implements Camellia encryption > >+LICENSE= BSD2CLAUSE >+LICENSE_FILE= ${WRKSRC}/License.txt >+ > USE_RUBY= yes > USE_RUBY_SETUP= yes > >@@ -32,10 +35,4 @@ > ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ > .endfor > >-.include <bsd.port.pre.mk> >- >-.if ${RUBY_VER} >= 2.1 >-BROKEN= Does not build >-.endif >- >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >Files /usr/ports/security/ruby-camellia/camellia-rb-1.2.gem and ruby-camellia/camellia-rb-1.2.gem differ >diff -ruN /usr/ports/security/ruby-camellia/files/patch-ext_camellia-rb.c ruby-camellia/files/patch-ext_camellia-rb.c >--- /usr/ports/security/ruby-camellia/files/patch-ext_camellia-rb.c 1970-01-01 09:00:00.000000000 +0900 >+++ ruby-camellia/files/patch-ext_camellia-rb.c 2015-04-08 00:12:07.000000000 +0900 >@@ -0,0 +1,31 @@ >+--- ext/camellia-rb.c.orig 2009-01-26 13:53:51.000000000 +0900 >++++ ext/camellia-rb.c >+@@ -111,7 +111,7 @@ >+ /* >+ # encryption method >+ */ >+-static VALUE encrypt(VALUE self, VALUE args) >++static VALUE camellia_encrypt(VALUE self, VALUE args) >+ { >+ camelliaObject *camellia; >+ unsigned char *data; >+@@ -147,7 +147,7 @@ >+ /* >+ # decryption method >+ */ >+-static VALUE decrypt(VALUE self,VALUE args) >++static VALUE camellia_decrypt(VALUE self,VALUE args) >+ { >+ camelliaObject *camellia; >+ unsigned char *data; >+@@ -537,8 +537,8 @@ >+ //rb_define_singleton_method(cCamellia, "new", s_new, 0); >+ rb_define_private_method(cCamellia, "initialize", set_key, 1); >+ //rb_define_method(cCamellia, "set_key", set_key, 1); >+- rb_define_method(cCamellia, "encrypt", encrypt, 1); >+- rb_define_method(cCamellia, "decrypt", decrypt, 1); >++ rb_define_method(cCamellia, "encrypt", camellia_encrypt, 1); >++ rb_define_method(cCamellia, "decrypt", camellia_decrypt, 1); >+ rb_define_method(cCamellia, "cfb_salt", cfb_salt, 1); >+ rb_define_method(cCamellia, "cfb_encrypt", cfb_encrypt, 1); >+ rb_define_method(cCamellia, "cfb_decrypt", cfb_decrypt, 1); >diff -ruN /usr/ports/security/ruby-camellia/files/patch-setup.rb ruby-camellia/files/patch-setup.rb >--- /usr/ports/security/ruby-camellia/files/patch-setup.rb 1970-01-01 09:00:00.000000000 +0900 >+++ ruby-camellia/files/patch-setup.rb 2015-04-08 00:15:18.000000000 +0900 >@@ -0,0 +1,11 @@ >+--- setup.rb.orig 2009-01-20 10:46:11.000000000 +0900 >++++ setup.rb >+@@ -785,7 +785,7 @@ >+ else >+ require 'rbconfig' >+ end >+- ::Config::CONFIG >++ ::RbConfig::CONFIG >+ end >+ >+ def initialize(ardir_root, config) >diff -ruN /usr/ports/security/ruby-camellia/pkg-descr ruby-camellia/pkg-descr >--- /usr/ports/security/ruby-camellia/pkg-descr 2014-01-23 00:44:51.000000000 +0900 >+++ ruby-camellia/pkg-descr 2015-04-08 00:23:36.000000000 +0900 >@@ -2,4 +2,4 @@ > Supported key length : 128bit/192bit/256bit > Supported modes of operation : ECB/CFB/CBC > >-WWW: http://info.isl.ntt.co.jp/crypt/eng/camellia/index.html >+WWW: http://info.isl.ntt.co.jp/crypt/eng/camellia/index.html
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 199267
: 155308