Attachment 193897 Details for Bug 213085 – redmine ldap fix

[patch] redmine ldap fix

redmine.diff (text/plain), 2.02 KB, created by Mark Felder on 2018-06-01 19:02:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Felder

Created: 2018-06-01 19:02:04 UTC

Size: 2.02 KB

patch

obsolete

>Index: www/redmine/Makefile
>===================================================================
>--- www/redmine/Makefile	(revision 471283)
>+++ www/redmine/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	redmine
> PORTVERSION=	3.4.5
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://www.redmine.org/releases/
> 
>Index: www/redmine/files/patch-Gemfile
>===================================================================
>--- www/redmine/files/patch-Gemfile	(revision 471283)
>+++ www/redmine/files/patch-Gemfile	(working copy)
>@@ -1,4 +1,4 @@
>---- Gemfile.orig	2018-01-08 19:38:18 UTC
>+--- Gemfile.orig	2018-04-07 12:30:08 UTC
> +++ Gemfile
> @@ -4,24 +4,24 @@ if Gem::Version.new(Bundler::VERSION) < 
>    abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
>@@ -32,14 +32,15 @@
>  gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
>  
>  # Request at least rails-html-sanitizer 1.0.3 because of security advisories
>-@@ -33,27 +33,15 @@ gem "rbpdf", "~> 1.19.3"
>+@@ -31,29 +31,12 @@ gem "rails-html-sanitizer", ">= 1.0.3"
>+ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
>+ gem "rbpdf", "~> 1.19.3"
>  
>- # Optional gem for LDAP authentication
>- group :ldap do
>+-# Optional gem for LDAP authentication
>+-group :ldap do
> -  gem "net-ldap", "~> 0.12.0"
>-+  gem "net-ldap", "~> 0.12"
>- end
>- 
>+-end
>+-
>  # Optional gem for OpenID authentication
>  group :openid do
> -  gem "ruby-openid", "~> 2.3.0", :require => "openid"
>@@ -62,7 +63,7 @@
>  # Include database gems for the adapters found in the database
>  # configuration file
>  require 'erb'
>-@@ -86,23 +74,6 @@ else
>+@@ -86,23 +69,6 @@ else
>    warn("Please configure your config/database.yml first")
>  end
>  
>@@ -86,7 +87,7 @@
>  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
>  if File.exists?(local_gemfile)
>    eval_gemfile local_gemfile
>-@@ -112,3 +83,7 @@ end
>+@@ -112,3 +78,7 @@ end
>  Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
>    eval_gemfile file
>  end

Actions: View | Diff

Attachments on bug 213085: 193897 | 194226