Version bump, bug #463449, thank Coacher for report. Drop old.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF1989B07

6 files changed, 67 insertions, 115 deletions

diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog
index 7fff54ee2238..5a109b173075 100644
--- a/www-apps/redmine/ChangeLog
+++ b/www-apps/redmine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/redmine
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.37 2013/08/14 15:18:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.38 2013/09/02 14:13:43 pva Exp $
+
+*redmine-2.3.2 (02 Sep 2013)
+
+  02 Sep 2013; Peter Volkov <pva@gentoo.org>
+  -files/redmine-1.4.1-bundler.patch, -redmine-1.4.7.ebuild,
+  +redmine-2.3.2.ebuild, files/redmine-2.initd, -files/redmine.initd:
+  Version bump, bug #463449, thank Coacher for report. Drop old.
 
   14 Aug 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Fix e-mail address.
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 031b46c69742..2befedacf9b6 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -2,20 +2,18 @@
 Hash: SHA256
 
 AUX 10_redmine_vhost.conf 343 SHA256 4067d312a5fc8e7f1f98e8917d2e9c296a70a7e9847efaf92a8415d753387435 SHA512 839a01abedd2977f79bde2a55041d4e3e3a72de1e04e2bdc4aa5169b3ec22adce12b2b39d4b991d6e034fcd13fbcd030cba5ecc69ae71a76f7f37d2cdde09edc WHIRLPOOL 7bdb8c8eb7b24b5fa7750f14a5d6d90504b9e95b1c3d07827a1bba320135ff9aca195282bcc86e6964b742cf0dde3690d79065e61fd14145135ab6ff4c10816b
-AUX redmine-1.4.1-bundler.patch 504 SHA256 e3c49d68db8e439d9e9203d7369117bf4c61e322d37752e085d34daf012f3128 SHA512 02a799f692389ba79d58f21b2ff9cc3f0c4bdaf5883b787eaf02d43a687117c69dd57116265a48e5bb6378dac7b2fea7a6abb4e778e97bdba4e67d15c9d0eb7b WHIRLPOOL caafb4228182f736b46253f0542403ae4117549fbfd310c34b5c671d74653529bccf59f7f910a085925a271fa434eddfa46a9281ab477ad945c447de60702f0e
-AUX redmine-2.initd 1447 SHA256 51fe7f628d180378aa3e7bf39711c68c5571b0d71bc33ab25890860bc0540f72 SHA512 b9c65491dcf10703694f5a66eac70baf6d30431304335b91483fd30158e67e7f4d9974334730d5789db5dad40dcf23109e5579178a349f7515c4a588010fdb03 WHIRLPOOL 5364a68667ef4d88d912a062eb30187a77b497ae36d43d208c275697d8dd1496ca59b86fdbc83b3f868ca1405b7241eb65abc8bea00a4eccf4806c28c31acf4b
+AUX redmine-2.initd 1458 SHA256 fb8f37ea5b7bd3a42f2c5a7d1259776696cdc3238fb11b4ac631f699b7612720 SHA512 ad781f13445468b3e10e4833d451ce8c7280bdf8147e5b1df6ed18479b7a5c375e0087fa6a05974deab16b4fdd49925dee86762993a993840536572f3b696707 WHIRLPOOL 35f35c31b9fad331b47a36cae44c431fb64aacc25877beabd9a933b674ed840d2a4d09d4bf4e1dbce075aced0adf3810b8163f9a1a739593e65d4e5b7e1126a3
 AUX redmine.confd 267 SHA256 2ac6b7dfc2d055554b7ee9380fcf1a49a708bbd866987b775507d7a3b30f2d41 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94 WHIRLPOOL fd6e8c63921d7ab2d73b5b15ff91db64ead03e521325871e21a1d165e313a1e56c607e9d9553504ccdef10a917a85ecdd5502527df159012b471803f4063ea00
-AUX redmine.initd 1409 SHA256 9c261314cd556dd67cc232216d924e95bba08f0806aa07dac576951ed9ce2d24 SHA512 01758edab8e75d0e98189c371489b5e6bb94ef9f546d16f7113f75ecf3997ebb22e812cad28cee0b84f7b399518b54dc512fb5740959c3ead681cf5c0d1f9655 WHIRLPOOL beb638d1291e33103364269fabbcad5834947806969847260bdf2bf097b4801db642eba319fc14a2ef3aa179475260e12ceffc651917d7161371feb8a197da9f
-DIST redmine-1.4.7.tar.gz 3676293 SHA256 949bd0d88c12f7a77a6a9a47401478a733c9d0c07fea31fa334944e901f26349 SHA512 291d33266542445e1cc8d6a38d342fa098d59c34fb93c59f15531fbe17f33eb19cd5846caa3dbd5c0b358da1bd433098f807aeb2f9c1516aca150409164a6ef8 WHIRLPOOL 401acf393e2900bcc62427565337ddaaea10a2b8dda1b11ea5e28519ddc7356bc6a8823ab4c148afc0a76ae21f3aa2b6a87722c9f47da78c13466225e117a4a4
 DIST redmine-2.2.4.tar.gz 3754826 SHA256 8465eb42865f7b5972a27fd66f08678244a77f7fc495ccb99978fbdbf8968d7f SHA512 d6ed394de71db1b98d22f47e105b698c798d84887161977d264f1629e8d5e917a0f24fd633378c855243609d9b318d81a81dc4d703198f043a24f01fcbdd6024 WHIRLPOOL fcd3c79dfab006f2eade4d9ae3d6d987731a7e21a7c51727fb184291e98364f6be7b96452ebd33419565069a2cc757d5f2b606ba8c2dcca3d4b685067b333f1b
-EBUILD redmine-1.4.7.ebuild 6047 SHA256 447a2225b2ad09fbc12b007e17a37f3a0811bf35ae39bbfd7adeffefec0df9ce SHA512 c01628f87fd687f4cdafb6f349453ae4a517cb449f74a551f815fa88361b29d7983dfc034832b3425fa3ba2757b7f38cc0392308b89690b66317fd01afbc7237 WHIRLPOOL eaeaa968609248745498dab7298d6542451f4f63670167a4c6a1639f4301a722329f114784b9b6859e086d7a5300b27c31963c4dc36b873dfa7b7f0755949d56
+DIST redmine-2.3.2.tar.gz 3801029 SHA256 dc3f86f2ac591c6d0886d183b68604aa80fc90d412bdeab0c3a57c9cd7b43384 SHA512 e7dbf520762db204f8aca8940b429ca004e96f7f5175dcc261e2d96e2d730714189bce3dce91374cd360968250239680894872af459986e97ed76700e496d699 WHIRLPOOL fa3d802cdbebacb84dd91af105a34c40dfeef1f4232b5780cd8ef7a8a0adbed817a96e63ae62415c526e73ff4b5132b698eaad530a91213bdd1fd572c20df76b
 EBUILD redmine-2.2.4.ebuild 6609 SHA256 ad2422537e9cc2f335ef6c752671ac81c71266e527c153d262e64921cf28b13e SHA512 e1d1802b95f59175c7ed079b19488e9c748166d1b818a5cd21c1004686dc92cff49b4ff9b8f0912697ba15ea8360b6564cc5dd615049200c4c45f766520efc29 WHIRLPOOL 281b4addc4b1982ebef3b7711858cff89c88b2e19de6a61177a59f64ca13044aaac14b51dc1e637703cda85111d2d8fcfa2023df84cdd773b69001a746a8490f
-MISC ChangeLog 7633 SHA256 028674b41c1cc429cbbe14bd70c1a3b78f8965562f1e551ed1bc9b0a8505f235 SHA512 27ae12e4c7dfd7f90eae3448cf0c284555349f90dbac7773087ad0b6843dbc99538deca0147557329e0a83d9cc6bbed84551e844e0ccf6fa285e8e0e536e20ff WHIRLPOOL 26bd6f4a00b952e7260bc4d8861a6e88d96a2fb5e73da6036daade503c37f2ab7bf882fedf7487290efcbb71640c88fd03cc7e4b5b460e7edf51105f6cabd63d
+EBUILD redmine-2.3.2.ebuild 6538 SHA256 329101c99fd6abd8b8e6c267fae221afbacd4554f136ad60fbdea236e2d874a8 SHA512 82a00525a21da53dfbdea2ba628b000b7da0869446c7843f5e137aa28d2ba77943d4779698b5085dd09c25c78f0a7fd4f640503bc5fa207a37785e14424a9579 WHIRLPOOL 758f4e1c7624ec6ea5b4166b80d5eb49970521bf0d2a3c17914b4afcf7ed3fb96e735d6a376b50a6bfb5972357789baad4551acb574bec29a9ec6fcb4593f570
+MISC ChangeLog 7905 SHA256 addf293466a37fcfbf389692fee04c5099eab86d1fcc23eed9c000c6dab45022 SHA512 4b521071aacb6af3294d8fe72736ad0fc462461a47383f359a6070e1038202d5234d606cb90c6cbce41fab6283d4d4464b7704fd1a6cc6e629688111ef072eeb WHIRLPOOL 9da8a4f2df9dc129bc3ca7439d55697c91bd285c796f0cec0055e0469abb93ca0cc497942bc5b2846ad04f7ec636fda1aff09c5763180dbd8c18f9596ae905d6
 MISC metadata.xml 570 SHA256 94132e91206887cc26b518bc8887152ff4db8cf967e5fb866c3c802955395fd3 SHA512 d253e0a41ca27766caf87192271afcdd847f9930094d77739dec72e79acc880de6e6998b6bb13367546164c2907b81cfac22d409a59f58c18f2b6f163f64e7a9 WHIRLPOOL 3e2e867032311fc61864394a2bb921735167de99a8781afe5c0f1bf36954c5325eeb45d799264717a067f1d6456ed571d8ca47511e5c5e7f43eeed989ad3ff66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlILn+AACgkQVWmRsqeSphMd2gCeNHDogjhvvuS6PdzRWyRZFPuY
-P6gAni0u0PYx48B7wUhcj8xCbmz3Jhnf
-=DgLh
+iF4EAREIAAYFAlIknSoACgkQGrk+8vGYmwc55gD/RMIhdFRIkVmg1rSXOYr5JtVl
+mRn4cvFRqQ0AmO5pOXMA/1PTUe2NvhdLDSkZRjh3Oz1V8d3dk1MU+xjdIBcfO1Db
+=JRS0
 -----END PGP SIGNATURE-----
diff --git a/www-apps/redmine/files/redmine-1.4.1-bundler.patch b/www-apps/redmine/files/redmine-1.4.1-bundler.patch
deleted file mode 100644
index adef29a24226..000000000000
--- a/www-apps/redmine/files/redmine-1.4.1-bundler.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naurb redmine-1.4.1.orig/config/boot.rb redmine-1.4.1/config/boot.rb
---- redmine-1.4.1.orig/config/boot.rb	2012-04-20 19:01:56.000000000 +0900
-+++ redmine-1.4.1/config/boot.rb	2012-04-25 13:00:01.702911764 +0900
-@@ -41,11 +41,6 @@
-   class Boot
-     def run
-       load_initializer
--      Rails::Initializer.class_eval do
--        def load_gems
--          @bundler_loaded ||= Bundler.require :default, Rails.env
--        end
--      end
-       Rails::Initializer.run(:set_load_path)
-     end
-   end
diff --git a/www-apps/redmine/files/redmine-2.initd b/www-apps/redmine/files/redmine-2.initd
index f4fcdb20512a..e377788b2ccc 100644
--- a/www-apps/redmine/files/redmine-2.initd
+++ b/www-apps/redmine/files/redmine-2.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.3 2013/05/13 10:32:29 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.4 2013/09/02 14:13:44 pva Exp $
 
 RAILS_ENV=${RAILS_ENV:-production}
 REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine}
@@ -9,7 +9,7 @@ REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost}
 REDMINE_PORT=${REDMINE_PORT:-3000}
 REDMINE_USER=${REDMINE_USER:-redmine}
 REDMINE_GROUP=${REDMINE_GROUP:-redmine}
-REDMINE_PIDFILE="/run/redmine/server.pid"
+REDMINE_PIDFILE="/var/run/redmine/server.pid"
 
 depend() {
 	use apache2 git-daemon mysql net postgresql svnserve
@@ -23,9 +23,8 @@ start_pre() {
 		eerror
 		return 1
 	fi
-
-	if [ ! -d /run/redmine ]; then
-		checkpath -q -d -m 0755 -o redmine:redmine /run/redmine
+	if [ ! -d /var/run/redmine ]; then
+		checkpath -q -d -m 0755 -o redmine:redmine /var/run/redmine
 	fi
 }
 
@@ -37,7 +36,7 @@ start() {
 		--exec /usr/bin/ruby "${REDMINE_DIR}"/script/rails server -- \
 		--daemon --environment=${RAILS_ENV} \
 		--binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \
-		--pid "${REDMINE_PIDFILE}" \
+		--pid="${REDMINE_PIDFILE}" \
 		${REDMINE_OPTS}
 	eend $?
 }
diff --git a/www-apps/redmine/files/redmine.initd b/www-apps/redmine/files/redmine.initd
deleted file mode 100644
index 49d59301492d..000000000000
--- a/www-apps/redmine/files/redmine.initd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine.initd,v 1.5 2013/05/13 10:32:29 pva Exp $
-
-RAILS_ENV=${RAILS_ENV:-production}
-REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine}
-REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost}
-REDMINE_PORT=${REDMINE_PORT:-3000}
-REDMINE_USER=${REDMINE_USER:-redmine}
-REDMINE_GROUP=${REDMINE_GROUP:-redmine}
-REDMINE_PIDFILE="/run/redmine/server.pid"
-
-depend() {
-	use apache2 git-daemon mysql net postgresql svnserve
-}
-
-start_pre() {
-	if [ ! -e "${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		eerror "Execute the following command to initlize environment:"
-		eerror
-		eerror "# emerge --config www-apps/redmine"
-		eerror
-		return 1
-	fi
-
-	if [ ! -d /run/redmine ]; then
-		checkpath -q -d -m 0755 -o redmine:redmine /run/redmine
-	fi
-}
-
-start() {
-	ebegin "Starting redmine"
-	cd "${REDMINE_DIR}"
-	start-stop-daemon --start --quiet --user ${REDMINE_USER}:${REDMINE_GROUP} \
-		--pidfile "${REDMINE_PIDFILE}" \
-		--exec /usr/bin/ruby "${REDMINE_DIR}"/script/server -- \
-		--daemon --environment=${RAILS_ENV} \
-		--binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \
-		${REDMINE_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping redmine"
-	cd "${REDMINE_DIR}"
-	start-stop-daemon --signal INT --quiet --pidfile "${REDMINE_PIDFILE}"
-	eend $?
-}
diff --git a/www-apps/redmine/redmine-1.4.7.ebuild b/www-apps/redmine/redmine-2.3.2.ebuild
index 2995fcf50dd3..b2fda1992dcf 100644
--- a/www-apps/redmine/redmine-1.4.7.ebuild
+++ b/www-apps/redmine/redmine-2.3.2.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.4.7.ebuild,v 1.1 2013/05/11 21:29:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-2.3.2.ebuild,v 1.1 2013/09/02 14:13:43 pva Exp $
 
 EAPI="4"
-# rails:2.3 isn't available for ruby19 on Gentoo
-#USE_RUBY="ruby18 ruby19"
-USE_RUBY="ruby18"
+USE_RUBY="ruby18 ruby19"
 inherit eutils depend.apache ruby-ng
 
 DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
@@ -21,22 +19,27 @@ SLOT="0"
 IUSE="ldap openid imagemagick fastcgi passenger"
 
 #RDEPEND="$(ruby_implementation_depend jruby '>=' -1.6.7)[ssl]"
+RDEPEND="
+	ruby_targets_ruby18? (
+		>=dev-ruby/fastercsv-1.5[ruby_targets_ruby18]
+	)"
 
 ruby_add_rdepend "virtual/ruby-ssl
 	virtual/rubygems
-	>=dev-ruby/rails-2.3.15:2.3
-	dev-ruby/i18n:0.4
-	>=dev-ruby/coderay-1.0.6
-	>=dev-ruby/tzinfo-0.3.31
+	>=dev-ruby/rails-3.2.13:3.2
+	>=dev-ruby/jquery-rails-2.0.2
+	dev-ruby/i18n:0.6
+	>=dev-ruby/coderay-1.0.9
+	dev-ruby/builder:3
 	dev-ruby/rake
 	ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 )
-	openid? ( >=dev-ruby/ruby-openid-2.1.4 )
+	openid? (
+		>=dev-ruby/ruby-openid-2.1.4
+		>=dev-ruby/rack-openid-0.2.1
+	)
 	imagemagick? ( >=dev-ruby/rmagick-2 )
 	fastcgi? ( dev-ruby/fcgi )
-	passenger? ( www-apache/passenger )
-	ruby_targets_ruby18? (
-		>=dev-ruby/fastercsv-1.5
-	)"
+	passenger? ( www-apache/passenger )"
 #	ruby_targets_ruby18? (
 #		>=dev-ruby/fastercsv-1.5
 #		postgres? ( >=dev-ruby/pg-0.11 )
@@ -46,7 +49,7 @@ ruby_add_rdepend "virtual/ruby-ssl
 #	ruby_targets_ruby19? (
 #		postgres? ( >=dev-ruby/pg-0.11 )
 #		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql2:0.2 )
+#		mysql? ( dev-ruby/mysql2:0.3 )
 #	)
 #	ruby_targets_jruby? (
 #		dev-ruby/jruby-openssl
@@ -57,18 +60,12 @@ ruby_add_rdepend "virtual/ruby-ssl
 #	)
 
 #ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
 #	test? (
-#		!ruby_targets_ruby19? (
-#			>=dev-ruby/shoulda-2.11
-#		)
-#		ruby_targets_ruby19? (
-#			dev-ruby/test-unit
-#		)
-#		ruby_targets_jruby? (
-#			dev-ruby/test-unit
-#		)
-#		>=dev-ruby/edavis10-object_daddy
-#		=dev-ruby/mocha-0.12*
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#		<dev-ruby/nokogiri-1.6.0
 #	)"
 
 REDMINE_DIR="/var/lib/${PN}"
@@ -85,10 +82,14 @@ all_ruby_prepare() {
 	rm .gitignore .hgignore || die
 
 	rm Gemfile config/preinitializer.rb || die
-	epatch "${FILESDIR}/${PN}-1.4.1-bundler.patch"
 
 	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
 	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
+
+	# remove openid module in case openid is disabled
+	use openid || rm -r lib/plugins/open_id_authentication || die
+	# remove ldap staff module to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
 }
 
 all_ruby_install() {
@@ -121,20 +122,20 @@ all_ruby_install() {
 		"${REDMINE_DIR}/tmp" \
 		/var/log/${PN}
 
-	if use passenger ; then
+	if use passenger; then
 		has_apache
 		insinto "${APACHE_VHOSTS_CONFDIR}"
 		doins "${FILESDIR}/10_redmine_vhost.conf"
 	else
 		newconfd "${FILESDIR}/${PN}.confd" ${PN}
-		newinitd "${FILESDIR}/${PN}.initd" ${PN}
+		newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
 	fi
 	doenvd "${T}/50${PN}"
 }
 
 pkg_postinst() {
 	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
 		elog "Execute the following command to upgrade environment:"
 		elog
 		elog "# emerge --config \"=${CATEGORY}/${PF}\""
@@ -157,17 +158,29 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ] ; then
+	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
 		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
 		eerror "then edit this file in order to configure your database settings for \"production\" environment."
 		die
 	fi
 
 	local RAILS_ENV=${RAILS_ENV:-production}
-	local RUBY=${RUBY:-ruby18}
+	if [ ! -L /usr/bin/ruby ]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
 
 	cd "${EPREFIX}${REDMINE_DIR}" || die
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
 		einfo
 		einfo "Upgrading database."
 		einfo
@@ -175,8 +188,7 @@ pkg_config() {
 		einfo "Migrating database."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate:upgrade_plugin_migrations # || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate_plugins || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
 		einfo "Clear the cache and the existing sessions."
 		${RUBY} -S rake tmp:cache:clear || die
 		${RUBY} -S rake tmp:sessions:clear || die
@@ -186,7 +198,7 @@ pkg_config() {
 		einfo
 
 		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_session_store || die
+		${RUBY} -S rake generate_secret_token || die
 		einfo "Creating the database structure."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration dat."