| 1 |
commit: 2e1acd2130ed4110cbe04a30050023a9eb44a51e |
| 2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jan 25 23:43:08 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 26 00:19:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e1acd21 |
| 7 |
|
| 8 |
www-apps/redmine: strict certain versions for deps |
| 9 |
|
| 10 |
Modified *_requires.patch to strict rails to 4.2 and actionpack-xml_parser |
| 11 |
to 1.0 during configuration and execution. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/636210 |
| 14 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 15 |
|
| 16 |
.../redmine/files/redmine-3.3.4_requires.patch | 60 ------------ |
| 17 |
.../redmine/files/redmine-3.4.3_requires.patch | 73 ++++++++++++++ |
| 18 |
www-apps/redmine/redmine-3.2.8.ebuild | 106 +++++++++++---------- |
| 19 |
www-apps/redmine/redmine-3.3.5.ebuild | 2 +- |
| 20 |
www-apps/redmine/redmine-3.4.3.ebuild | 4 +- |
| 21 |
5 files changed, 133 insertions(+), 112 deletions(-) |
| 22 |
|
| 23 |
diff --git a/www-apps/redmine/files/redmine-3.3.4_requires.patch b/www-apps/redmine/files/redmine-3.3.4_requires.patch |
| 24 |
deleted file mode 100644 |
| 25 |
index e4510839cf4..00000000000 |
| 26 |
--- a/www-apps/redmine/files/redmine-3.3.4_requires.patch |
| 27 |
+++ /dev/null |
| 28 |
@@ -1,60 +0,0 @@ |
| 29 |
-diff -Nuar redmine-3.3.3-orig/app/controllers/application_controller.rb redmine-3.3.3/app/controllers/application_controller.rb |
| 30 |
---- redmine-3.3.3-orig/app/controllers/application_controller.rb 2017-05-24 21:05:03.515966923 +0500 |
| 31 |
-+++ redmine-3.3.3/app/controllers/application_controller.rb 2017-05-24 21:07:22.629960174 +0500 |
| 32 |
-@@ -15,6 +15,7 @@ |
| 33 |
- # along with this program; if not, write to the Free Software |
| 34 |
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 35 |
- |
| 36 |
-+require 'request_store' |
| 37 |
- require 'uri' |
| 38 |
- require 'cgi' |
| 39 |
- |
| 40 |
-diff -Nuar redmine-3.3.3-orig/app/controllers/welcome_controller.rb redmine-3.3.3/app/controllers/welcome_controller.rb |
| 41 |
---- redmine-3.3.3-orig/app/controllers/welcome_controller.rb 2017-05-24 21:05:03.514966923 +0500 |
| 42 |
-+++ redmine-3.3.3/app/controllers/welcome_controller.rb 2017-05-24 21:08:14.895957638 +0500 |
| 43 |
-@@ -15,6 +15,9 @@ |
| 44 |
- # along with this program; if not, write to the Free Software |
| 45 |
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 46 |
- |
| 47 |
-+require 'action_controller' |
| 48 |
-+require 'action_controller/action_caching' |
| 49 |
-+ |
| 50 |
- class WelcomeController < ApplicationController |
| 51 |
- caches_action :robots |
| 52 |
- |
| 53 |
-diff -Nuar redmine-3.3.3-orig/app/models/custom_field.rb redmine-3.3.3/app/models/custom_field.rb |
| 54 |
---- redmine-3.3.3-orig/app/models/custom_field.rb 2017-05-24 21:05:03.513966923 +0500 |
| 55 |
-+++ redmine-3.3.3/app/models/custom_field.rb 2017-05-24 21:08:32.223956797 +0500 |
| 56 |
-@@ -15,6 +15,8 @@ |
| 57 |
- # along with this program; if not, write to the Free Software |
| 58 |
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 59 |
- |
| 60 |
-+require 'protected_attributes' |
| 61 |
-+ |
| 62 |
- class CustomField < ActiveRecord::Base |
| 63 |
- include Redmine::SubclassFactory |
| 64 |
- |
| 65 |
-diff -Nuar redmine-3.3.3-orig/app/models/mailer.rb redmine-3.3.3/app/models/mailer.rb |
| 66 |
---- redmine-3.3.3-orig/app/models/mailer.rb 2017-05-24 21:05:03.514966923 +0500 |
| 67 |
-+++ redmine-3.3.3/app/models/mailer.rb 2017-05-24 21:05:47.039964812 +0500 |
| 68 |
-@@ -16,6 +16,7 @@ |
| 69 |
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 70 |
- |
| 71 |
- require 'roadie' |
| 72 |
-+require 'roadie-rails' |
| 73 |
- |
| 74 |
- class Mailer < ActionMailer::Base |
| 75 |
- layout 'mailer' |
| 76 |
-diff -Nuar redmine-3.3.3-orig/config/application.rb redmine-3.3.3/config/application.rb |
| 77 |
---- redmine-3.3.3-orig/config/application.rb 2017-05-24 21:05:03.689966915 +0500 |
| 78 |
-+++ redmine-3.3.3/config/application.rb 2017-05-24 21:05:35.723965361 +0500 |
| 79 |
-@@ -1,8 +1,8 @@ |
| 80 |
- require File.expand_path('../boot', __FILE__) |
| 81 |
- |
| 82 |
- require 'rails/all' |
| 83 |
-+require 'action_dispatch/xml_params_parser' |
| 84 |
- |
| 85 |
--Bundler.require(*Rails.groups) |
| 86 |
- |
| 87 |
- module RedmineApp |
| 88 |
- class Application < Rails::Application |
| 89 |
|
| 90 |
diff --git a/www-apps/redmine/files/redmine-3.4.3_requires.patch b/www-apps/redmine/files/redmine-3.4.3_requires.patch |
| 91 |
new file mode 100644 |
| 92 |
index 00000000000..338f627adb1 |
| 93 |
--- /dev/null |
| 94 |
+++ b/www-apps/redmine/files/redmine-3.4.3_requires.patch |
| 95 |
@@ -0,0 +1,73 @@ |
| 96 |
+diff -Nuar redmine-3.4.3-orig/app/controllers/application_controller.rb redmine-3.4.3/app/controllers/application_controller.rb |
| 97 |
+--- redmine-3.4.3-orig/app/controllers/application_controller.rb 2017-12-11 20:55:04.942299001 +0500 |
| 98 |
++++ redmine-3.4.3/app/controllers/application_controller.rb 2017-12-11 20:55:17.285298402 +0500 |
| 99 |
+@@ -15,6 +15,7 @@ |
| 100 |
+ # along with this program; if not, write to the Free Software |
| 101 |
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 102 |
+ |
| 103 |
++require 'request_store' |
| 104 |
+ require 'uri' |
| 105 |
+ require 'cgi' |
| 106 |
+ |
| 107 |
+diff -Nuar redmine-3.4.3-orig/app/controllers/welcome_controller.rb redmine-3.4.3/app/controllers/welcome_controller.rb |
| 108 |
+--- redmine-3.4.3-orig/app/controllers/welcome_controller.rb 2017-12-11 20:55:04.942299001 +0500 |
| 109 |
++++ redmine-3.4.3/app/controllers/welcome_controller.rb 2017-12-11 20:55:17.286298402 +0500 |
| 110 |
+@@ -15,6 +15,9 @@ |
| 111 |
+ # along with this program; if not, write to the Free Software |
| 112 |
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 113 |
+ |
| 114 |
++require 'action_controller' |
| 115 |
++require 'action_controller/action_caching' |
| 116 |
++ |
| 117 |
+ class WelcomeController < ApplicationController |
| 118 |
+ self.main_menu = false |
| 119 |
+ |
| 120 |
+diff -Nuar redmine-3.4.3-orig/app/models/custom_field.rb redmine-3.4.3/app/models/custom_field.rb |
| 121 |
+--- redmine-3.4.3-orig/app/models/custom_field.rb 2017-12-11 20:55:04.926299002 +0500 |
| 122 |
++++ redmine-3.4.3/app/models/custom_field.rb 2017-12-11 20:55:17.286298402 +0500 |
| 123 |
+@@ -15,6 +15,8 @@ |
| 124 |
+ # along with this program; if not, write to the Free Software |
| 125 |
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 126 |
+ |
| 127 |
++require 'protected_attributes' |
| 128 |
++ |
| 129 |
+ class CustomField < ActiveRecord::Base |
| 130 |
+ include Redmine::SafeAttributes |
| 131 |
+ include Redmine::SubclassFactory |
| 132 |
+diff -Nuar redmine-3.4.3-orig/app/models/mailer.rb redmine-3.4.3/app/models/mailer.rb |
| 133 |
+--- redmine-3.4.3-orig/app/models/mailer.rb 2017-12-11 20:55:04.926299002 +0500 |
| 134 |
++++ redmine-3.4.3/app/models/mailer.rb 2017-12-11 20:55:17.286298402 +0500 |
| 135 |
+@@ -16,6 +16,7 @@ |
| 136 |
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 137 |
+ |
| 138 |
+ require 'roadie' |
| 139 |
++require 'roadie-rails' |
| 140 |
+ |
| 141 |
+ class Mailer < ActionMailer::Base |
| 142 |
+ layout 'mailer' |
| 143 |
+diff -Nuar redmine-3.4.3-orig/bin/rails redmine-3.4.3/bin/rails |
| 144 |
+--- redmine-3.4.3-orig/bin/rails 2017-12-11 20:55:04.986298999 +0500 |
| 145 |
++++ redmine-3.4.3/bin/rails 2017-12-11 20:58:40.247288555 +0500 |
| 146 |
+@@ -1,4 +1,6 @@ |
| 147 |
+ #!/usr/bin/env ruby |
| 148 |
+ APP_PATH = File.expand_path('../../config/application', __FILE__) |
| 149 |
+ require_relative '../config/boot' |
| 150 |
++ |
| 151 |
++gem 'rails', '~> 4.2' |
| 152 |
+ require 'rails/commands' |
| 153 |
+diff -Nuar redmine-3.4.3-orig/config/application.rb redmine-3.4.3/config/application.rb |
| 154 |
+--- redmine-3.4.3-orig/config/application.rb 2017-12-11 20:55:04.971298999 +0500 |
| 155 |
++++ redmine-3.4.3/config/application.rb 2017-12-11 20:58:20.477289514 +0500 |
| 156 |
+@@ -1,8 +1,11 @@ |
| 157 |
+ require File.expand_path('../boot', __FILE__) |
| 158 |
+ |
| 159 |
++gem 'rails', '~> 4.2' |
| 160 |
++gem 'actionpack-xml_parser', '~> 1.0' |
| 161 |
++ |
| 162 |
+ require 'rails/all' |
| 163 |
++require 'action_dispatch/xml_params_parser' |
| 164 |
+ |
| 165 |
+-Bundler.require(*Rails.groups) |
| 166 |
+ |
| 167 |
+ module RedmineApp |
| 168 |
+ class Application < Rails::Application |
| 169 |
|
| 170 |
diff --git a/www-apps/redmine/redmine-3.2.8.ebuild b/www-apps/redmine/redmine-3.2.8.ebuild |
| 171 |
index c0bd7c7e880..951845e783f 100644 |
| 172 |
--- a/www-apps/redmine/redmine-3.2.8.ebuild |
| 173 |
+++ b/www-apps/redmine/redmine-3.2.8.ebuild |
| 174 |
@@ -2,6 +2,7 @@ |
| 175 |
# Distributed under the terms of the GNU General Public License v2 |
| 176 |
|
| 177 |
EAPI=6 |
| 178 |
+# ruby24 don't have required deps |
| 179 |
USE_RUBY="ruby22 ruby23" |
| 180 |
inherit eutils depend.apache ruby-ng user |
| 181 |
|
| 182 |
@@ -15,42 +16,41 @@ SLOT="0" |
| 183 |
# All db-related USEs are ineffective since we depend on rails |
| 184 |
# which depends on activerecord which depends on all ruby's db bindings |
| 185 |
#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger" |
| 186 |
-IUSE="ldap fastcgi passenger imagemagick" |
| 187 |
+IUSE="imagemagick fastcgi ldap markdown passenger" |
| 188 |
|
| 189 |
ruby_add_rdepend " |
| 190 |
- dev-ruby/rubygems |
| 191 |
- >=dev-ruby/rails-4.2.5.2:4.2 |
| 192 |
- >=dev-ruby/jquery-rails-3.1.4:3 |
| 193 |
- >=dev-ruby/coderay-1.1.0 |
| 194 |
- >=dev-ruby/builder-3.0.4:* |
| 195 |
- >=dev-ruby/roadie-rails-1.1.0 |
| 196 |
- dev-ruby/mime-types:* |
| 197 |
- =dev-ruby/request_store-1.0.5 |
| 198 |
- >=dev-ruby/rbpdf-1.19.0 |
| 199 |
dev-ruby/actionpack-action_caching |
| 200 |
dev-ruby/actionpack-xml_parser:0 |
| 201 |
+ >=dev-ruby/builder-3.2.2:3.2 |
| 202 |
+ >=dev-ruby/coderay-1.1.0 |
| 203 |
+ dev-ruby/i18n:0.7 |
| 204 |
+ >=dev-ruby/jquery-rails-3.1.4:3 |
| 205 |
+ dev-ruby/loofah |
| 206 |
+ dev-ruby/mime-types:* |
| 207 |
+ dev-ruby/mimemagic |
| 208 |
+ >=dev-ruby/nokogiri-1.6.8 |
| 209 |
dev-ruby/protected_attributes |
| 210 |
- >=dev-ruby/redcarpet-3.3.2 |
| 211 |
- >=dev-ruby/nokogiri-1.6.7.2 |
| 212 |
- ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 ) |
| 213 |
- >=dev-ruby/ruby-openid-2.3.0 |
| 214 |
>=dev-ruby/rack-openid-0.2.1 |
| 215 |
+ >=dev-ruby/rails-4.2.5.2:4.2 |
| 216 |
+ >=dev-ruby/rails-html-sanitizer-1.0.3 |
| 217 |
+ dev-ruby/request_store:1.0.5 |
| 218 |
+ >=dev-ruby/roadie-rails-1.1.0 |
| 219 |
+ >=dev-ruby/rbpdf-1.19.2 |
| 220 |
+ >=dev-ruby/ruby-openid-2.3.0 |
| 221 |
+ dev-ruby/rubygems |
| 222 |
fastcgi? ( dev-ruby/fcgi ) |
| 223 |
+ imagemagick? ( >=dev-ruby/rmagick-2.14.0 ) |
| 224 |
+ ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 ) |
| 225 |
+ markdown? ( >=dev-ruby/redcarpet-3.3.2 ) |
| 226 |
passenger? ( www-apache/passenger ) |
| 227 |
- imagemagick? ( >=dev-ruby/rmagick-2.14.0 )" |
| 228 |
- # ruby_targets_ruby19? ( |
| 229 |
-# postgres? ( >=dev-ruby/pg-0.11 ) |
| 230 |
-# sqlite3? ( dev-ruby/sqlite3 ) |
| 231 |
-# mysql? ( dev-ruby/mysql2:0.3 ) |
| 232 |
-# ) |
| 233 |
- |
| 234 |
+ " |
| 235 |
+# TODO add USE doc and test |
| 236 |
#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2 |
| 237 |
# dev-ruby/yard |
| 238 |
# test? ( |
| 239 |
# >=dev-ruby/shoulda-3.3.2 |
| 240 |
# >=dev-ruby/mocha-0.13.3 |
| 241 |
# >=dev-ruby/capybara-2.0.0 |
| 242 |
-# <dev-ruby/nokogiri-1.6.0 |
| 243 |
# )" |
| 244 |
|
| 245 |
REDMINE_DIR="/var/lib/${PN}" |
| 246 |
@@ -66,26 +66,20 @@ all_ruby_prepare() { |
| 247 |
# bug #406605 |
| 248 |
rm .{git,hg}ignore || die |
| 249 |
|
| 250 |
- echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}" |
| 251 |
- echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}" |
| 252 |
+ cat > "${T}/50${PN}" <<-EOF || die |
| 253 |
+ CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config" |
| 254 |
+ CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml" |
| 255 |
+ EOF |
| 256 |
|
| 257 |
# remove ldap staff module if disabled to avoid #413779 |
| 258 |
use ldap || rm app/models/auth_source_ldap.rb || die |
| 259 |
|
| 260 |
- # Make it work |
| 261 |
- sed -i -e "1irequire 'request_store'" app/controllers/application_controller.rb || die |
| 262 |
- sed -i -e "18irequire 'action_controller'" -e "19irequire 'action_controller/action_caching'"\ |
| 263 |
- app/controllers/welcome_controller.rb || die |
| 264 |
- sed -i -e "4irequire 'action_dispatch/xml_params_parser'" -e "/Bundler/d" config/application.rb || die |
| 265 |
- sed -i -e "18irequire 'protected_attributes'" app/models/custom_field.rb || die |
| 266 |
- sed -i -e "19irequire 'roadie-rails'" app/models/mailer.rb || die |
| 267 |
+ eapply "${FILESDIR}/${PN}-3.4.3_requires.patch" |
| 268 |
} |
| 269 |
|
| 270 |
all_ruby_install() { |
| 271 |
- dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} |
| 272 |
- rm -r doc || die |
| 273 |
- dodoc README.rdoc |
| 274 |
- rm README.rdoc || die |
| 275 |
+ dodoc doc/* README.rdoc |
| 276 |
+ rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die |
| 277 |
|
| 278 |
keepdir /var/log/${PN} |
| 279 |
|
| 280 |
@@ -128,7 +122,9 @@ all_ruby_install() { |
| 281 |
} |
| 282 |
|
| 283 |
pkg_postinst() { |
| 284 |
- if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then |
| 285 |
+ if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \ |
| 286 |
+ || -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]] |
| 287 |
+ then |
| 288 |
elog "Execute the following command to upgrade environment:" |
| 289 |
elog |
| 290 |
elog "# emerge --config \"=${CATEGORY}/${PF}\"" |
| 291 |
@@ -138,7 +134,7 @@ pkg_postinst() { |
| 292 |
else |
| 293 |
elog "Execute the following command to initialize environment:" |
| 294 |
elog |
| 295 |
- elog "# cd ${EPREFIX}${REDMINE_DIR}" |
| 296 |
+ elog "# cd ${EROOT%/}${REDMINE_DIR}" |
| 297 |
elog "# cp config/database.yml.example config/database.yml" |
| 298 |
elog "# \${EDITOR} config/database.yml" |
| 299 |
elog "# chown redmine:redmine config/database.yml" |
| 300 |
@@ -150,38 +146,49 @@ pkg_postinst() { |
| 301 |
} |
| 302 |
|
| 303 |
pkg_config() { |
| 304 |
- if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then |
| 305 |
- eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml" |
| 306 |
- eerror "then edit this file in order to configure your database settings for \"production\" environment." |
| 307 |
+ if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then |
| 308 |
+ eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to" |
| 309 |
+ eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this" |
| 310 |
+ eerror "file in order to configure your database settings for" |
| 311 |
+ eerror "\"production\" environment." |
| 312 |
die |
| 313 |
fi |
| 314 |
|
| 315 |
local RAILS_ENV=${RAILS_ENV:-production} |
| 316 |
- if [ ! -L /usr/bin/ruby ]; then |
| 317 |
+ if [[ ! -L /usr/bin/ruby ]]; then |
| 318 |
eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation." |
| 319 |
eerror "Please update it via `eselect ruby`" |
| 320 |
die |
| 321 |
fi |
| 322 |
- if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr -d ' ' )* ]]; then |
| 323 |
- eerror "/usr/bin/ruby is currently not included in redmine's ruby targets: ${RUBY_TARGETS}." |
| 324 |
+ if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr -d ' ' )* ]] |
| 325 |
+ then |
| 326 |
+ eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:" |
| 327 |
+ eerror "${RUBY_TARGETS}." |
| 328 |
eerror "Please update it via `eselect ruby`" |
| 329 |
die |
| 330 |
fi |
| 331 |
local RUBY=${RUBY:-ruby} |
| 332 |
|
| 333 |
- cd "${EPREFIX}${REDMINE_DIR}" || die |
| 334 |
- if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then |
| 335 |
+ cd "${EROOT%/}${REDMINE_DIR}" || die |
| 336 |
+ if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]] |
| 337 |
+ then |
| 338 |
einfo |
| 339 |
einfo "Generating secret token." |
| 340 |
einfo |
| 341 |
rm config/initializers/session_store.rb || die |
| 342 |
RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die |
| 343 |
fi |
| 344 |
- if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then |
| 345 |
+ if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]] |
| 346 |
+ then |
| 347 |
einfo |
| 348 |
einfo "Upgrading database." |
| 349 |
einfo |
| 350 |
|
| 351 |
+ einfo "Generating secret token." |
| 352 |
+ # Migration from Redmine 2.x |
| 353 |
+ rm config/initializers/secret_token.rb || die |
| 354 |
+ RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die |
| 355 |
+ |
| 356 |
einfo "Migrating database." |
| 357 |
RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die |
| 358 |
einfo "Upgrading the plugin migrations." |
| 359 |
@@ -200,11 +207,12 @@ pkg_config() { |
| 360 |
RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die |
| 361 |
einfo "Populating database with default configuration data." |
| 362 |
RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die |
| 363 |
- chown redmine:redmine "${EPREFIX}${REDMINE_DIR}"/log/production.log |
| 364 |
+ chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die |
| 365 |
einfo |
| 366 |
- einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files." |
| 367 |
+ einfo "If you use sqlite3, please do not forget to change the ownership" |
| 368 |
+ einfo "of the sqlite files." |
| 369 |
einfo |
| 370 |
- einfo "# cd \"${EPREFIX}${REDMINE_DIR}\"" |
| 371 |
+ einfo "# cd \"${EROOT%/}${REDMINE_DIR}\"" |
| 372 |
einfo "# chown redmine:redmine db/ db/*.sqlite3" |
| 373 |
einfo |
| 374 |
fi |
| 375 |
|
| 376 |
diff --git a/www-apps/redmine/redmine-3.3.5.ebuild b/www-apps/redmine/redmine-3.3.5.ebuild |
| 377 |
index 80dcfc03248..951845e783f 100644 |
| 378 |
--- a/www-apps/redmine/redmine-3.3.5.ebuild |
| 379 |
+++ b/www-apps/redmine/redmine-3.3.5.ebuild |
| 380 |
@@ -74,7 +74,7 @@ all_ruby_prepare() { |
| 381 |
# remove ldap staff module if disabled to avoid #413779 |
| 382 |
use ldap || rm app/models/auth_source_ldap.rb || die |
| 383 |
|
| 384 |
- eapply "${FILESDIR}/${P}_requires.patch" |
| 385 |
+ eapply "${FILESDIR}/${PN}-3.4.3_requires.patch" |
| 386 |
} |
| 387 |
|
| 388 |
all_ruby_install() { |
| 389 |
|
| 390 |
diff --git a/www-apps/redmine/redmine-3.4.3.ebuild b/www-apps/redmine/redmine-3.4.3.ebuild |
| 391 |
index d2e874a23be..80dcfc03248 100644 |
| 392 |
--- a/www-apps/redmine/redmine-3.4.3.ebuild |
| 393 |
+++ b/www-apps/redmine/redmine-3.4.3.ebuild |
| 394 |
@@ -20,7 +20,7 @@ IUSE="imagemagick fastcgi ldap markdown passenger" |
| 395 |
|
| 396 |
ruby_add_rdepend " |
| 397 |
dev-ruby/actionpack-action_caching |
| 398 |
- dev-ruby/actionpack-xml_parser:* |
| 399 |
+ dev-ruby/actionpack-xml_parser:0 |
| 400 |
>=dev-ruby/builder-3.2.2:3.2 |
| 401 |
>=dev-ruby/coderay-1.1.0 |
| 402 |
dev-ruby/i18n:0.7 |
| 403 |
@@ -74,7 +74,7 @@ all_ruby_prepare() { |
| 404 |
# remove ldap staff module if disabled to avoid #413779 |
| 405 |
use ldap || rm app/models/auth_source_ldap.rb || die |
| 406 |
|
| 407 |
- eapply "${FILESDIR}/${PN}-3.3.4_requires.patch" |
| 408 |
+ eapply "${FILESDIR}/${P}_requires.patch" |
| 409 |
} |
| 410 |
|
| 411 |
all_ruby_install() { |
Archives