From owner-svn-ports-all@freebsd.org  Wed Aug 10 14:19:06 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 0E2D8BB4347;
 Wed, 10 Aug 2016 14:19:06 +0000 (UTC) (envelope-from tz@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 D52CE1942;
 Wed, 10 Aug 2016 14:19:05 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7AEJ5d9088666;
 Wed, 10 Aug 2016 14:19:05 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7AEJ5X6088664;
 Wed, 10 Aug 2016 14:19:05 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201608101419.u7AEJ5X6088664@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org
 using -f
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Wed, 10 Aug 2016 14:19:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r420022 - in head/security/dradis: . 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-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Aug 2016 14:19:06 -0000

Author: tz
Date: Wed Aug 10 14:19:04 2016
New Revision: 420022
URL: https://svnweb.freebsd.org/changeset/ports/420022

Log:
  security/dradis: fix Gemfile patch
  
  The port was broken because it needs Rails 3.0.4. It now accepts the
  current version 3.2.22.2 and the new rubygem RedCloth version
  
  Approved by: swills (mentor)

Modified:
  head/security/dradis/Makefile
  head/security/dradis/files/patch-server__Gemfile

Modified: head/security/dradis/Makefile
==============================================================================
--- head/security/dradis/Makefile	Wed Aug 10 14:17:49 2016	(r420021)
+++ head/security/dradis/Makefile	Wed Aug 10 14:19:04 2016	(r420022)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dradis
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.1
 CATEGORIES=	security

Modified: head/security/dradis/files/patch-server__Gemfile
==============================================================================
--- head/security/dradis/files/patch-server__Gemfile	Wed Aug 10 14:17:49 2016	(r420021)
+++ head/security/dradis/files/patch-server__Gemfile	Wed Aug 10 14:19:04 2016	(r420022)
@@ -1,8 +1,13 @@
---- ./server/Gemfile.orig	2010-11-30 17:45:17.000000000 +0100
-+++ ./server/Gemfile	2011-01-09 22:37:36.000000000 +0100
-@@ -11,11 +11,11 @@
- #
- gem 'RedCloth', :require => 'redcloth'
+--- server/Gemfile.orig	2011-02-11 09:59:58 UTC
++++ server/Gemfile
+@@ -1,14 +1,14 @@
+ source 'http://rubygems.org'
+ 
+-gem 'rails', '3.0.4'
++gem 'rails', '>= 3.0.4'
+ 
+-gem 'RedCloth', '4.2.5', :require => 'redcloth'
++gem 'RedCloth', '>= 4.2.5', :require => 'redcloth'
  
 -if !( (RUBY_PLATFORM =~ /mswin/i) || (RUBY_PLATFORM =~ /mingw/i) )
 -  gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3'