Attachment #155308 for bug #199267

View | Details | Raw Unified | Return to bug 199267
Collapse All | Expand All

Lines 12-17 Link Here

(-)ruby-camellia/Makefile (-7 / +4 lines)
12	MAINTAINER= osho@pcc-software.org	12	MAINTAINER= osho@pcc-software.org
13	COMMENT= Ruby extension library which implements Camellia encryption	13	COMMENT= Ruby extension library which implements Camellia encryption
14		14
		15	LICENSE= BSD2CLAUSE
		16	LICENSE_FILE= ${WRKSRC}/License.txt
		17
15	USE_RUBY= yes	18	USE_RUBY= yes
16	USE_RUBY_SETUP= yes	19	USE_RUBY_SETUP= yes
17		20
Lines 32-41 Link Here
32	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/	35	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
33	.endfor	36	.endfor
34		37
35	.include <bsd.port.pre.mk>	38	.include <bsd.port.mk>
36
37	.if ${RUBY_VER} >= 2.1
38	BROKEN= Does not build
39	.endif
40
41	.include <bsd.port.post.mk>




--- 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);

Line 0 Link Here

(-)ruby-camellia/files/patch-setup.rb (+11 lines)
	1	--- setup.rb.orig 2009-01-20 10:46:11.000000000 +0900
	2	+++ setup.rb
	3	@@ -785,7 +785,7 @@
	4	else
	5	require 'rbconfig'
	6	end
	7	- ::Config::CONFIG
	8	+ ::RbConfig::CONFIG
	9	end
	10
	11	def initialize(ardir_root, config)

Lines 2-5 Link Here

(-)ruby-camellia/pkg-descr (-1 / +1 lines)
2	Supported key length : 128bit/192bit/256bit	2	Supported key length : 128bit/192bit/256bit
3	Supported modes of operation : ECB/CFB/CBC	3	Supported modes of operation : ECB/CFB/CBC
4		4
5	WWW: http://info.isl.ntt.co.jp/crypt/eng/camellia/index.html	5	WWW: http://info.isl.ntt.co.jp/crypt/eng/camellia/index.html

Return to bug 199267

Line 0 Link Here

(-)ruby-camellia/files/patch-ext_camellia-rb.c (+31 lines)
	1	--- ext/camellia-rb.c.orig 2009-01-26 13:53:51.000000000 +0900
	2	+++ ext/camellia-rb.c
	3	@@ -111,7 +111,7 @@
	4	/*
	5	# encryption method
	6	*/
	7	-static VALUE encrypt(VALUE self, VALUE args)
	8	+static VALUE camellia_encrypt(VALUE self, VALUE args)
	9	{
	10	camelliaObject *camellia;
	11	unsigned char *data;
	12	@@ -147,7 +147,7 @@
	13	/*
	14	# decryption method
	15	*/
	16	-static VALUE decrypt(VALUE self,VALUE args)
	17	+static VALUE camellia_decrypt(VALUE self,VALUE args)
	18	{
	19	camelliaObject *camellia;
	20	unsigned char *data;
	21	@@ -537,8 +537,8 @@
	22	//rb_define_singleton_method(cCamellia, "new", s_new, 0);
	23	rb_define_private_method(cCamellia, "initialize", set_key, 1);
	24	//rb_define_method(cCamellia, "set_key", set_key, 1);
	25	- rb_define_method(cCamellia, "encrypt", encrypt, 1);
	26	- rb_define_method(cCamellia, "decrypt", decrypt, 1);
	27	+ rb_define_method(cCamellia, "encrypt", camellia_encrypt, 1);
	28	+ rb_define_method(cCamellia, "decrypt", camellia_decrypt, 1);
	29	rb_define_method(cCamellia, "cfb_salt", cfb_salt, 1);
	30	rb_define_method(cCamellia, "cfb_encrypt", cfb_encrypt, 1);
	31	rb_define_method(cCamellia, "cfb_decrypt", cfb_decrypt, 1);