From owner-svn-ports-head@freebsd.org Tue Jan 3 05:06:35 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F719C9BBBC; Tue, 3 Jan 2017 05:06:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 F37561988; Tue, 3 Jan 2017 05:06:34 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0356YYG095021; Tue, 3 Jan 2017 05:06:34 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0356XLb095018; Tue, 3 Jan 2017 05:06:33 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201701030506.v0356XLb095018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 3 Jan 2017 05:06:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430439 - in head/www/redmine: . 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.23 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: Tue, 03 Jan 2017 05:06:35 -0000 Author: swills Date: Tue Jan 3 05:06:33 2017 New Revision: 430439 URL: https://svnweb.freebsd.org/changeset/ports/430439 Log: www/redmine: fix with newer gems Fix with newer ldap and mysql. PR: 213127 Modified: head/www/redmine/Makefile head/www/redmine/files/mysql.rb head/www/redmine/files/patch-Gemfile Modified: head/www/redmine/Makefile ============================================================================== --- head/www/redmine/Makefile Tue Jan 3 05:02:33 2017 (r430438) +++ head/www/redmine/Makefile Tue Jan 3 05:06:33 2017 (r430439) @@ -3,7 +3,7 @@ PORTNAME= redmine PORTVERSION= 3.2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.redmine.org/releases/ @@ -28,7 +28,8 @@ RUN_DEPENDS= rubygem-bundler>=1.5.0:sysu rubygem-rbpdf>=1.19.0:print/rubygem-rbpdf \ rubygem-rake>=0:devel/rubygem-rake \ rubygem-ruby-openid>=2.3.0:net/rubygem-ruby-openid \ - rubygem-rack-openid>=0:www/rubygem-rack-openid + rubygem-rack-openid>=0:www/rubygem-rack-openid \ + rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap NO_ARCH= yes NO_BUILD= yes @@ -54,12 +55,11 @@ PASSENGER_DESC= Use Apache/Nginx WEB ser MYSQL_DESC= MySQL database support (via mysql2 rubygem) NO_OPTIONS_SORT= yes -MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.3.11:databases/rubygem-mysql2 +MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 PASSENGER_RUN_DEPENDS= passenger-config:www/rubygem-passenger POSTGRESQL_RUN_DEPENDS= rubygem-pg>=0.18.1:databases/rubygem-pg MARKDOWN_RUN_DEPENDS= rubygem-redcarpet>=3.3.2:textproc/rubygem-redcarpet RMAGIC_RUN_DEPENDS= rubygem-rmagick>=2.14.0:graphics/rubygem-rmagick -LDAP_RUN_DEPENDS= rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap THIN_RUN_DEPENDS= rubygem-thin>=1.6.2:www/rubygem-thin THIN_SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} THIN_VARS= USE_RC_SUBR=redmine Modified: head/www/redmine/files/mysql.rb ============================================================================== --- head/www/redmine/files/mysql.rb Tue Jan 3 05:02:33 2017 (r430438) +++ head/www/redmine/files/mysql.rb Tue Jan 3 05:06:33 2017 (r430439) @@ -1 +1 @@ -gem "mysql2", "~> 0.3.11" +gem "mysql2", "~> 0.4.5" Modified: head/www/redmine/files/patch-Gemfile ============================================================================== --- head/www/redmine/files/patch-Gemfile Tue Jan 3 05:02:33 2017 (r430438) +++ head/www/redmine/files/patch-Gemfile Tue Jan 3 05:06:33 2017 (r430439) @@ -24,15 +24,14 @@ # Request at least rails-html-sanitizer 1.0.3 because of security advisories gem "rails-html-sanitizer", ">= 1.0.3" -@@ -26,29 +26,12 @@ gem "rails-html-sanitizer", ">= 1.0.3" - gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby] - gem "rbpdf", "~> 1.19.0" +@@ -28,27 +28,15 @@ gem "rbpdf", "~> 1.19.0" --# Optional gem for LDAP authentication --group :ldap do + # Optional gem for LDAP authentication + group :ldap do - gem "net-ldap", "~> 0.12.0" --end -- ++ gem "net-ldap", "~> 0.15.0" + end + # Optional gem for OpenID authentication group :openid do - gem "ruby-openid", "~> 2.3.0", :require => "openid" @@ -55,7 +54,13 @@ platforms :jruby do # jruby-openssl is bundled with JRuby 1.7.0 gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0' -@@ -72,7 +55,7 @@ if File.exist?(database_file) +@@ -67,12 +55,12 @@ if File.exist?(database_file) + adapters.each do |adapter| + case adapter + when 'mysql2' +- gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw] ++ gem "mysql2", "~> 0.4.5", :platforms => [:mri, :mingw, :x64_mingw] + gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when 'mysql' gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when /postgresql/ @@ -64,7 +69,7 @@ gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby when /sqlite3/ gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw] -@@ -92,21 +75,6 @@ else +@@ -92,21 +80,6 @@ else warn("Please configure your config/database.yml first") end @@ -86,7 +91,7 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) eval_gemfile local_gemfile -@@ -116,3 +84,7 @@ end +@@ -116,3 +89,7 @@ end Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file end