From owner-svn-ports-head@FreeBSD.ORG Fri May 8 09:21:48 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B928C6FD; Fri, 8 May 2015 09:21:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6CCF1B47; Fri, 8 May 2015 09:21:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t489LmG8042313; Fri, 8 May 2015 09:21:48 GMT (envelope-from mmoll@FreeBSD.org) Received: (from mmoll@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t489LlXw042308; Fri, 8 May 2015 09:21:47 GMT (envelope-from mmoll@FreeBSD.org) Message-Id: <201505080921.t489LlXw042308@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mmoll set sender to mmoll@FreeBSD.org using -f From: Michael Moll Date: Fri, 8 May 2015 09:21:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385743 - in head/security/ruby-camellia: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2015 09:21:48 -0000 Author: mmoll Date: Fri May 8 09:21:47 2015 New Revision: 385743 URL: https://svnweb.freebsd.org/changeset/ports/385743 Log: security/ruby-camellia: unbreak build for ruby 2.1+ PR: 199267 Differential Revision: https://reviews.freebsd.org/D2476 Submitted by: Yoshisato Yanagisawa (maintainer) Approved by: swills (mentor) Added: head/security/ruby-camellia/files/ head/security/ruby-camellia/files/patch-ext_camellia-rb.c (contents, props changed) head/security/ruby-camellia/files/patch-setup.rb (contents, props changed) Modified: head/security/ruby-camellia/Makefile head/security/ruby-camellia/pkg-descr Modified: head/security/ruby-camellia/Makefile ============================================================================== --- head/security/ruby-camellia/Makefile Fri May 8 09:17:53 2015 (r385742) +++ head/security/ruby-camellia/Makefile Fri May 8 09:21:47 2015 (r385743) @@ -12,6 +12,9 @@ DIST_SUBDIR= ruby 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 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ .endfor -.include - -.if ${RUBY_VER} >= 2.1 -BROKEN= Does not build -.endif - -.include +.include Added: head/security/ruby-camellia/files/patch-ext_camellia-rb.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ruby-camellia/files/patch-ext_camellia-rb.c Fri May 8 09:21:47 2015 (r385743) @@ -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); Added: head/security/ruby-camellia/files/patch-setup.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ruby-camellia/files/patch-setup.rb Fri May 8 09:21:47 2015 (r385743) @@ -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) Modified: head/security/ruby-camellia/pkg-descr ============================================================================== --- head/security/ruby-camellia/pkg-descr Fri May 8 09:17:53 2015 (r385742) +++ head/security/ruby-camellia/pkg-descr Fri May 8 09:21:47 2015 (r385743) @@ -2,4 +2,4 @@ This is a Camellia package for Ruby. Cam 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