[gentoo-commits] repo/gentoo:master commit in: www-apps/redmine/, www-apps/redmine/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: www-apps/redmine/, www-apps/redmine/files/
@ 2020-06-15 10:57 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-06-15 10:57 UTC (permalink / raw
  To: gentoo-commits

commit:     f41bc627b6b7c6a5618fd62d1f4e6075965d23e0
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Jun 15 10:54:43 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 10:57:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41bc627

www-apps/redmine: fixing bugs

Fixed bugs based on reports from Bugzilla:

* #724384 - changed file permissions for config.ru to redmine:redmine
* #724388 - updated Apache2's 10_redmine_vhost.conf to comply 2.4 syntax
* #724464 - relaxing rails version to ~>5.2.4

Closes: https://bugs.gentoo.org/724384
Closes: https://bugs.gentoo.org/724388
Closes: https://bugs.gentoo.org/724464
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-apps/redmine/files/10_redmine_vhost.conf |   3 +-
 www-apps/redmine/redmine-4.1.1-r1.ebuild     | 231 +++++++++++++++++++++++++++
 2 files changed, 232 insertions(+), 2 deletions(-)

diff --git a/www-apps/redmine/files/10_redmine_vhost.conf b/www-apps/redmine/files/10_redmine_vhost.conf
index 33a117a91e5..3b67d93c2de 100644
--- a/www-apps/redmine/files/10_redmine_vhost.conf
+++ b/www-apps/redmine/files/10_redmine_vhost.conf
@@ -5,8 +5,7 @@ Listen 3000
 #       RailsEnv production
         <Directory "/var/lib/redmine/public">
                 Options FollowSymLinks
-                Order allow,deny
-                Allow from all
+                Require all granted
         </Directory>
 </VirtualHost>
 </IfModule>

diff --git a/www-apps/redmine/redmine-4.1.1-r1.ebuild b/www-apps/redmine/redmine-4.1.1-r1.ebuild
new file mode 100644
index 00000000000..f58dfec1059
--- /dev/null
+++ b/www-apps/redmine/redmine-4.1.1-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby25 ruby26"
+inherit depend.apache ruby-ng
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
+
+DEPS="
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( dev-ruby/mini_magick )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	markdown? ( >=dev-ruby/redcarpet-3.5.0 )
+	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
+	passenger? ( www-apache/passenger )
+	postgres? ( >=dev-ruby/pg-1.1.4:1 )
+	sqlite? ( >=dev-ruby/sqlite3-1.4.0 )
+	dev-ruby/actionpack-xml_parser:2
+	>=dev-ruby/i18n-1.6.0:1
+	>=dev-ruby/mail-2.7.1
+	dev-ruby/mimemagic
+	>=dev-ruby/mini_mime-1.0.1
+	>=dev-ruby/nokogiri-1.10.0
+	dev-ruby/rails:5.2
+	>=dev-ruby/rbpdf-1.20.0
+	dev-ruby/request_store:0
+	>=dev-ruby/roadie-rails-2.1.0
+	>=dev-ruby/rouge-3.12.0
+	>=dev-ruby/ruby-openid-2.9.2
+	dev-ruby/rack-openid
+"
+
+ruby_add_bdepend "${DEPS}"
+
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+all_ruby_prepare() {
+	rm -fr log files/delete.me .github || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	# newenvd not working here
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# Fixing versions in Gemfile
+	sed -i -e "s/~>/>=/g" Gemfile || die
+	# bug #724464
+	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>5.2.4'/" Gemfile || die
+
+	sed -i -e "/csv/d" Gemfile || die
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :minimagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		# remove ldap stuff module if disabled to avoid #413779
+		use ldap || rm app/models/auth_source_ldap.rb || die
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem 'fcgi'" > Gemfile.local
+	fi
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config.ru" \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	# Remove old lock file
+	rm -f "${EROOT%/}${REDMINE_DIR}/Gemfile.lock"
+
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	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
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${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 "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		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 redmine:plugins:migrate || die
+		einfo "Clear the cache."
+		${RUBY} -S rake tmp:cache:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${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 data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine -R "${EROOT%/}/var/log/redmine/" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/redmine/, www-apps/redmine/files/
@ 2022-12-24  7:42 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-24  7:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ee6e4e14121a4bdf5c529eb49e95c7dadfef7ca2
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri Dec  9 13:02:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 07:41:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee6e4e14

www-apps/redmine: drop 4.2.7, 5.0.2

Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28612
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-apps/redmine/Manifest                          |   2 -
 .../files/redmine-4.2.7-rails-yaml-safe_load.patch |  29 ---
 www-apps/redmine/redmine-4.2.7.ebuild              | 244 -------------------
 www-apps/redmine/redmine-5.0.2.ebuild              | 258 ---------------------
 4 files changed, 533 deletions(-)

diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index f09269665aec..bf9b294f12be 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,4 +1,2 @@
-DIST redmine-4.2.7.tar.gz 3042676 BLAKE2B 023448a6b1ea20ef0d924def19f661a6d1099f3ab6fe0c887e4e8782773bcc63488075d86f3dc70d8ebf87d44e6b6b242be4a1fb4b5cce5cc361f6f39e99e6d4 SHA512 6654aec3981de8b26de416d253c22c91d881dd7df54192ce41e6e99213c6f4b0947ce213fe484c18117f8701d0528ebb23fe3acf335f84638eeddd972b601be9
 DIST redmine-4.2.9.tar.gz 3043566 BLAKE2B 682e1b517a1dba705d5687b8be004d1cc0db3a0a9d8cbecd6a72846e211743491d755da3a24488d563fa73f63969e0ae5ea527bb9aacc8b3399720848194d142 SHA512 b0c6cade20dbcb4dd5c88081fb44f63dc3687b3735d47572e71bfeff0e17d2e4c9281afc10cf3b9679ab1e492a71a260a1d3fac5b660af5226849ccac4e0dd36
-DIST redmine-5.0.2.tar.gz 3104135 BLAKE2B abc0f2dfe8f3eacc134172c0d740cc17f269371a90027d87b0329d03fafb1dc17532fc55343dbac9e07e0a195acc67cc133be92eae2b48e0ad9f4afce876afd1 SHA512 aeb0486b2193b0c622f878b67089f9628a59c28bc7a6d3660756dd8047e13b199198d2b7cf42d04c1235f06567e4c4f572d529f964edb862fcd19e2ce7febbdc
 DIST redmine-5.0.4.tar.gz 3114593 BLAKE2B 2a8247f18696d23607011f1c7d59c5411aead8230e8e7b30c7778a2aaa3064ccccc4bf05b33bac6a3d78cb22775f015bfe7a15cb69e529c60a087d9498164d84 SHA512 e1c0693ae1d4c71de7bef8d78b42e2d81cd53a2bd0bdfa83778528f40b5d43bb118e8e22f29112130f3082ddafd0c8931b05d5409e7a3f8a23dc619c5d84cf78

diff --git a/www-apps/redmine/files/redmine-4.2.7-rails-yaml-safe_load.patch b/www-apps/redmine/files/redmine-4.2.7-rails-yaml-safe_load.patch
deleted file mode 100644
index dcd4bdb51073..000000000000
--- a/www-apps/redmine/files/redmine-4.2.7-rails-yaml-safe_load.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8eb7563204e6c9b3a1fcff453c08ed4824b20bc6 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Wed, 13 Jul 2022 13:52:18 +0300
-Subject: [PATCH] Added compatibility option for recent Rails
-
-Rails 5.2.8.1, 6.0.5.1, 6.1.6.1 and 7.0.3.1 fixes CVE-2022-32224 which
-breaks compatibility with old implementation of YAML.unsafe_load.
-
-Added `config.active_record.yaml_column_permitted_classes = [Symbol]` to
-configuration of application to workaround issue.
----
- config/application.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/application.rb b/config/application.rb
-index bba468f38..78557d376 100644
---- a/config/application.rb
-+++ b/config/application.rb
-@@ -32,6 +32,7 @@ module RedmineApp
- 
-     config.active_record.store_full_sti_class = true
-     config.active_record.default_timezone = :local
-+    config.active_record.yaml_column_permitted_classes = [Symbol]
- 
-     config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
- 
--- 
-2.35.1
-

diff --git a/www-apps/redmine/redmine-4.2.7.ebuild b/www-apps/redmine/redmine-4.2.7.ebuild
deleted file mode 100644
index 373621607812..000000000000
--- a/www-apps/redmine/redmine-4.2.7.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-inherit depend.apache ruby-ng
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="https://www.redmine.org/"
-SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="fastcgi imagemagick ldap markdown +minimagick mysql passenger pdf postgres sqlite"
-
-PATCHES=(
-	"${FILESDIR}/${P}-rails-yaml-safe_load.patch"
-)
-
-ruby_add_bdepend "
-	fastcgi? ( dev-ruby/fcgi )
-	ldap? ( dev-ruby/ruby-net-ldap )
-	minimagick? ( dev-ruby/mini_magick )
-	markdown? ( >=dev-ruby/redcarpet-3.5.1 )
-	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
-	passenger? ( www-apache/passenger )
-	postgres? ( >=dev-ruby/pg-1.1.4:1 )
-	sqlite? ( >=dev-ruby/sqlite3-1.4.0 )
-	dev-ruby/actionpack-xml_parser:2
-	dev-ruby/addressable
-	dev-ruby/csv:3
-	>=dev-ruby/i18n-1.8.2:1
-	>=dev-ruby/mail-2.7.1
-	dev-ruby/marcel
-	dev-ruby/mimemagic
-	>=dev-ruby/mini_mime-1.0.1
-	>=dev-ruby/nokogiri-1.11.1
-	dev-ruby/rack-openid
-	>=dev-ruby/rails-5.2.8.1:5.2
-	>=dev-ruby/rbpdf-1.20.0
-	>=dev-ruby/request_store-1.5.0:0
-	>=dev-ruby/roadie-rails-2.2.0:2
-	dev-ruby/rotp
-	>=dev-ruby/rouge-3.26.0
-	dev-ruby/rqrcode
-	>=dev-ruby/ruby-openid-2.9.2
-	>=dev-ruby/rubyzip-2.3.0:2
-"
-
-RDEPEND="
-	acct-group/redmine
-	acct-user/redmine
-	imagemagick? ( media-gfx/imagemagick )
-	pdf? (
-		app-text/ghostscript-gpl
-		media-gfx/imagemagick
-	)
-"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-all_ruby_prepare() {
-	rm -fr log files/delete.me .github || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	# newenvd not working here
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT}/${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT}/${REDMINE_DIR}/config/locales ${EROOT}/${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# Fixing versions in Gemfile
-	sed -i -e "s/~>/>=/g" Gemfile || die
-
-	# bug #724464
-	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>5.2.6'/" Gemfile || die
-
-	sed -i -e "/group :development do/,/end$/d" Gemfile || die
-	sed -i -e "/group :test do/,/end$/d" Gemfile || die
-
-	if ! use imagemagick ; then
-		sed -i -e "/group :minimagick do/,/end$/d" Gemfile || die
-	fi
-	if ! use ldap ; then
-		# remove ldap stuff module if disabled to avoid #413779
-		use ldap || rm app/models/auth_source_ldap.rb || die
-		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
-	fi
-	if ! use markdown ; then
-		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
-	fi
-	# Additional dependency for Gemfile (#657156)
-	if use fastcgi; then
-		echo "gem 'fcgi'" > Gemfile.local
-	fi
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc test appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}"/{app/views/previews,files,public/plugin_assets,vendor}
-	keepdir "${REDMINE_DIR}"/tmp/{cache,imports,sessions,sockets}
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config.ru" \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT}/${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-}
-
-pkg_config() {
-	# Remove old lock file
-	rm -f "${EROOT}/${REDMINE_DIR}/Gemfile.lock"
-
-	if [[ ! -e "${EROOT}/${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT}/${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT}/${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	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
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT}/${REDMINE_DIR}" || die
-	if [[ -e "${EROOT}/${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 "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		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 redmine:plugins:migrate || die
-		einfo "Clear the cache."
-		${RUBY} -S rake tmp:cache:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${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 data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine -R "${EROOT}/var/log/redmine/" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT}/${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}

diff --git a/www-apps/redmine/redmine-5.0.2.ebuild b/www-apps/redmine/redmine-5.0.2.ebuild
deleted file mode 100644
index 8b1b55111a6c..000000000000
--- a/www-apps/redmine/redmine-5.0.2.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27"
-inherit depend.apache ruby-ng
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="https://www.redmine.org/"
-SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="fastcgi imagemagick ldap markdown +minimagick mysql passenger pdf postgres sqlite"
-
-ruby_add_bdepend "
-	fastcgi? ( dev-ruby/fcgi )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.17.0 )
-	minimagick? ( >=dev-ruby/mini_magick-4.11.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.5.1 )
-	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
-	passenger? ( www-apache/passenger )
-	postgres? ( >=dev-ruby/pg-1.2.2:1 )
-	sqlite? ( >=dev-ruby/sqlite3-1.4.0 )
-	dev-ruby/actionpack-xml_parser:2
-	dev-ruby/addressable
-	>=dev-ruby/commonmarker-0.23.4
-	dev-ruby/csv:3
-	>=dev-ruby/deckar01-task_list-2.3.2
-	>=dev-ruby/html-pipeline-2.13.2
-	>=dev-ruby/i18n-1.10.0:1
-	>=dev-ruby/mail-2.7.1
-	dev-ruby/marcel
-	>=dev-ruby/mini_mime-1.1.0
-	>=dev-ruby/net-imap-0.2.2
-	>=dev-ruby/net-pop-0.1.1
-	>=dev-ruby/net-smtp-0.3.0
-	>=dev-ruby/nokogiri-1.13.0
-	>=dev-ruby/rails-6.1.6:6.1
-	>=dev-ruby/rbpdf-1.20.0
-	>=dev-ruby/request_store-1.5.0:0
-	dev-ruby/rexml
-	>=dev-ruby/roadie-rails-3.0.0:3
-	>=dev-ruby/rotp-5.0.0
-	>=dev-ruby/rouge-3.28.0
-	dev-ruby/rqrcode
-	>=dev-ruby/rubyzip-2.3.0:2
-	>=dev-ruby/sanitize-6.0:6
-"
-
-RDEPEND="
-	acct-group/redmine
-	acct-user/redmine
-	imagemagick? ( media-gfx/imagemagick )
-	pdf? (
-		app-text/ghostscript-gpl
-		media-gfx/imagemagick
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/redmine-4.2.7-rails-yaml-safe_load.patch"
-)
-
-REDMINE_DIR="/var/lib/${PN}"
-
-all_ruby_prepare() {
-	rm -fr log files/delete.me .github || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	# newenvd not working here
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT}/${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT}/${REDMINE_DIR}/config/locales ${EROOT}/${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# Fixing versions in Gemfile
-	sed -i -e "s/~>/>=/g" Gemfile || die
-
-	# bug #724464
-	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>6.1.6'/" Gemfile || die
-
-	# Commonmark
-	sed -i -e "s/'0.23.4'/'>=0.23.4'/" -e "s/'2.3.2'/'>=2.3.2'/" Gemfile
-
-	sed -i -e "/group :development do/,/end$/d" Gemfile || die
-	sed -i -e "/group :test do/,/end$/d" Gemfile || die
-
-	if ! use imagemagick ; then
-		sed -i -e "/group :minimagick do/,/end$/d" Gemfile || die
-	fi
-	if ! use ldap ; then
-		# remove ldap stuff module if disabled to avoid #413779
-		use ldap || rm app/models/auth_source_ldap.rb || die
-		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
-	fi
-	if ! use markdown ; then
-		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
-	fi
-	# Additional dependency for Gemfile (#657156)
-	if use fastcgi; then
-		echo "gem 'fcgi'" > Gemfile.local
-	fi
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc test appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}"/{app/views/previews,files,public/plugin_assets,vendor}
-	keepdir "${REDMINE_DIR}"/tmp/{cache,imports,sessions,sockets}
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config.ru" \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	if [[ -e "${EROOT}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-
-	elog
-	elog "OpenID support was removed in Redmine 5.0. If you are using OpenID"
-	elog "authentication, you should switch back to Redmine 4.2 or install and"
-	elog "enable an OpenID plugin. See https://redmine.org/issues/35755."
-	elog
-}
-
-pkg_config() {
-	# Remove old lock file
-	rm -f "${EROOT}${REDMINE_DIR}/Gemfile.lock"
-
-	if [[ ! -e "${EROOT}${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT}${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT}${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	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
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT}${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 "${EROOT}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		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 redmine:plugins:migrate || die
-		einfo "Clear the cache."
-		${RUBY} -S rake tmp:cache:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${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 data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine -R "${EROOT}/var/log/redmine/" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/redmine/, www-apps/redmine/files/
@ 2022-07-15 15:08 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-07-15 15:08 UTC (permalink / raw
  To: gentoo-commits

commit:     fd880c7576c4f6aabf009fa63b95ba1e4dc1fd4e
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Jul 13 11:00:55 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 15:08:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd880c75

www-apps/redmine: add 4.2.7

Closes: https://bugs.gentoo.org/852740
Bug: https://bugs.gentoo.org/852743
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-apps/redmine/Manifest                          |   1 +
 .../files/redmine-4.2.7-rails-yaml-safe_load.patch |  29 +++
 www-apps/redmine/redmine-4.2.7.ebuild              | 244 +++++++++++++++++++++
 3 files changed, 274 insertions(+)

diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 5fc9ac894ead..b8a4435a7d82 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,2 +1,3 @@
 DIST redmine-4.1.5.tar.gz 2722929 BLAKE2B 83c9c974bbfecfcb796833640ed9b3cb4b2e2550714e702d9b024a41f676c2c71f8e6f4119b2519654556451313a0276a4dbe307f41747466b0034f415cde662 SHA512 cf4020bff11b13986989e312db1e7ee459f4391ec7326f59a4f493fb0c95be87d19196377da60ac083801b7c792dc012769350b684e20dd887c431c0c18cc851
 DIST redmine-4.2.3.tar.gz 3039136 BLAKE2B 68656da4a9a43139ab78b70e7e7364cbc776a75ea3069962086c49ea2ca965739efc47d6709b0068d94a884eaa6b56a641826ffbb16276cc8d686374a88d9e75 SHA512 456117b0d5d72ee58c87def84327e29f79937fa71098b48a80103e3e6653648c0df46afcc4f533803384ba7413e690538deeee33e263d86dd9e4e5dec65144e3
+DIST redmine-4.2.7.tar.gz 3042676 BLAKE2B 023448a6b1ea20ef0d924def19f661a6d1099f3ab6fe0c887e4e8782773bcc63488075d86f3dc70d8ebf87d44e6b6b242be4a1fb4b5cce5cc361f6f39e99e6d4 SHA512 6654aec3981de8b26de416d253c22c91d881dd7df54192ce41e6e99213c6f4b0947ce213fe484c18117f8701d0528ebb23fe3acf335f84638eeddd972b601be9

diff --git a/www-apps/redmine/files/redmine-4.2.7-rails-yaml-safe_load.patch b/www-apps/redmine/files/redmine-4.2.7-rails-yaml-safe_load.patch
new file mode 100644
index 000000000000..dcd4bdb51073
--- /dev/null
+++ b/www-apps/redmine/files/redmine-4.2.7-rails-yaml-safe_load.patch
@@ -0,0 +1,29 @@
+From 8eb7563204e6c9b3a1fcff453c08ed4824b20bc6 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Wed, 13 Jul 2022 13:52:18 +0300
+Subject: [PATCH] Added compatibility option for recent Rails
+
+Rails 5.2.8.1, 6.0.5.1, 6.1.6.1 and 7.0.3.1 fixes CVE-2022-32224 which
+breaks compatibility with old implementation of YAML.unsafe_load.
+
+Added `config.active_record.yaml_column_permitted_classes = [Symbol]` to
+configuration of application to workaround issue.
+---
+ config/application.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/config/application.rb b/config/application.rb
+index bba468f38..78557d376 100644
+--- a/config/application.rb
++++ b/config/application.rb
+@@ -32,6 +32,7 @@ module RedmineApp
+ 
+     config.active_record.store_full_sti_class = true
+     config.active_record.default_timezone = :local
++    config.active_record.yaml_column_permitted_classes = [Symbol]
+ 
+     config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
+ 
+-- 
+2.35.1
+

diff --git a/www-apps/redmine/redmine-4.2.7.ebuild b/www-apps/redmine/redmine-4.2.7.ebuild
new file mode 100644
index 000000000000..373621607812
--- /dev/null
+++ b/www-apps/redmine/redmine-4.2.7.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+inherit depend.apache ruby-ng
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="fastcgi imagemagick ldap markdown +minimagick mysql passenger pdf postgres sqlite"
+
+PATCHES=(
+	"${FILESDIR}/${P}-rails-yaml-safe_load.patch"
+)
+
+ruby_add_bdepend "
+	fastcgi? ( dev-ruby/fcgi )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	minimagick? ( dev-ruby/mini_magick )
+	markdown? ( >=dev-ruby/redcarpet-3.5.1 )
+	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
+	passenger? ( www-apache/passenger )
+	postgres? ( >=dev-ruby/pg-1.1.4:1 )
+	sqlite? ( >=dev-ruby/sqlite3-1.4.0 )
+	dev-ruby/actionpack-xml_parser:2
+	dev-ruby/addressable
+	dev-ruby/csv:3
+	>=dev-ruby/i18n-1.8.2:1
+	>=dev-ruby/mail-2.7.1
+	dev-ruby/marcel
+	dev-ruby/mimemagic
+	>=dev-ruby/mini_mime-1.0.1
+	>=dev-ruby/nokogiri-1.11.1
+	dev-ruby/rack-openid
+	>=dev-ruby/rails-5.2.8.1:5.2
+	>=dev-ruby/rbpdf-1.20.0
+	>=dev-ruby/request_store-1.5.0:0
+	>=dev-ruby/roadie-rails-2.2.0:2
+	dev-ruby/rotp
+	>=dev-ruby/rouge-3.26.0
+	dev-ruby/rqrcode
+	>=dev-ruby/ruby-openid-2.9.2
+	>=dev-ruby/rubyzip-2.3.0:2
+"
+
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+	imagemagick? ( media-gfx/imagemagick )
+	pdf? (
+		app-text/ghostscript-gpl
+		media-gfx/imagemagick
+	)
+"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+all_ruby_prepare() {
+	rm -fr log files/delete.me .github || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	# newenvd not working here
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT}/${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT}/${REDMINE_DIR}/config/locales ${EROOT}/${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# Fixing versions in Gemfile
+	sed -i -e "s/~>/>=/g" Gemfile || die
+
+	# bug #724464
+	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>5.2.6'/" Gemfile || die
+
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :minimagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		# remove ldap stuff module if disabled to avoid #413779
+		use ldap || rm app/models/auth_source_ldap.rb || die
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem 'fcgi'" > Gemfile.local
+	fi
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc test appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}"/{app/views/previews,files,public/plugin_assets,vendor}
+	keepdir "${REDMINE_DIR}"/tmp/{cache,imports,sessions,sockets}
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config.ru" \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT}/${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT}/${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	# Remove old lock file
+	rm -f "${EROOT}/${REDMINE_DIR}/Gemfile.lock"
+
+	if [[ ! -e "${EROOT}/${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT}/${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT}/${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	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
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT}/${REDMINE_DIR}" || die
+	if [[ -e "${EROOT}/${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 "${EROOT}/${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		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 redmine:plugins:migrate || die
+		einfo "Clear the cache."
+		${RUBY} -S rake tmp:cache:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${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 data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine -R "${EROOT}/var/log/redmine/" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT}/${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/redmine/, www-apps/redmine/files/
@ 2019-12-08  8:41 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2019-12-08  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e163dc22eecc5f00721fa11ee1645b0079031301
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Aug 28 17:53:46 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 08:41:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e163dc22

www-apps/redmine: update to 4.0.5

Implementing GLEP81, fixes #677986 and #692890.

Fixes strict dependencies and adds additional fcgi gem (#657156), fixes
error with /var/log/redmine permission changes. Clear Gemfile.lock in
config phase to clean up and update dependencies (#660252).

Closes: https://bugs.gentoo.org/677986
Closes: https://bugs.gentoo.org/692890
Closes: https://bugs.gentoo.org/657156
Closes: https://bugs.gentoo.org/660252
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-apps/redmine/Manifest                          |   1 +
 .../files/redmine-4.0.5_gemfile_versions.patch     |  76 +++++++
 www-apps/redmine/redmine-4.0.5.ebuild              | 224 +++++++++++++++++++++
 3 files changed, 301 insertions(+)

diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 1aa30ff383b..684c9db78b3 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,2 +1,3 @@
 DIST redmine-3.3.7.tar.gz 2371716 BLAKE2B ba1e69419f846ddfa64ddc5d26fda281737501374f5aa4f79bd4c59d5b483a28070103fcc3bf2f3b1c7a4ce96dbfb32d1d1f21a6b74603aad012ce7d2e3373ed SHA512 ba106eb60587788ccd3162274a9a40d2876324e647e1fcafce0f943d69d8fe216a01cbddb2a5a4f41f64513e287c80ec518cef5a6033b3d1ed0bcfc7d1cfcc64
 DIST redmine-3.4.5.tar.gz 2448231 BLAKE2B 11041cbac5ea33c060a90ead56a4479cc86137bad5e0eb6135aed8d19059aedecd2ad52ac63ae6fcc5bbb13b5fc4cd6b05695aff484932b55ad5d7be7cb1c396 SHA512 c77ce76fadb7a2b9d6daf77a898a1ca4d7b1c8616922e89026cee3a4b0ec1a187a746f0a054b786663e78fc510596be736fd12d71b2569f6a63a21d0c95a05ad
+DIST redmine-4.0.5.tar.gz 2519900 BLAKE2B ddc465f12030f3f672ea9bf6b825fd40344dcffd3b60907a42c4dbe57f209c54a12bbd3d59f886ff000ccbd43f6d1b9c1aacfbab653f2d81bb06d8d7189bd624 SHA512 a6aa3e2418fd83ed3783fc6644c339c54ebb1952b8c2c0be4b718fb296fdff64fb4116faa2c88f3e5c3c25d7c5b3c21cd7822ff9f99f6f67270e0b8b64053678

diff --git a/www-apps/redmine/files/redmine-4.0.5_gemfile_versions.patch b/www-apps/redmine/files/redmine-4.0.5_gemfile_versions.patch
new file mode 100644
index 00000000000..46aebf2b825
--- /dev/null
+++ b/www-apps/redmine/files/redmine-4.0.5_gemfile_versions.patch
@@ -0,0 +1,76 @@
+diff -Nuar redmine-4.0.5.orig/Gemfile redmine-4.0.5/Gemfile
+--- redmine-4.0.5.orig/Gemfile	2019-10-24 22:20:32.412728804 +0300
++++ redmine-4.0.5/Gemfile	2019-10-24 22:27:40.356708042 +0300
+@@ -3,46 +3,45 @@
+ gem "bundler", ">= 1.5.0"
+ 
+ gem "rails", "5.2.3"
+-gem "rouge", "~> 3.3.0"
++gem "rouge", ">= 3.3.0"
+ gem "request_store", "1.0.5"
+-gem "mini_mime", "~> 1.0.1"
++gem "mini_mime", ">= 1.0.1"
+ gem "actionpack-xml_parser"
+-gem "roadie-rails", "~> 1.3.0"
++gem "roadie-rails", ">= 1.3.0"
+ gem "mimemagic"
+-gem "mail", "~> 2.7.1"
+-gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6"
++gem "mail", ">= 2.7.1"
+ 
+-gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1")
++gem "nokogiri", (RUBY_VERSION >= "2.3" ? ">= 1.10.0" : "~> 1.9.1")
+ gem "i18n", "~> 0.7.0"
+ gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
+ 
+ # TODO: Remove the following line when #32223 is fixed
+-gem "sprockets", "~> 3.7.2"
++gem "sprockets", ">= 3.7.2"
+ 
+ # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
+-gem "rbpdf", "~> 1.19.6"
++gem "rbpdf", ">= 1.19.6"
+ 
+ # Optional gem for LDAP authentication
+ group :ldap do
+-  gem "net-ldap", "~> 0.16.0"
++  gem "net-ldap", ">= 0.16.0"
+ end
+ 
+ # Optional gem for OpenID authentication
+ group :openid do
+-  gem "ruby-openid", "~> 2.9.2", :require => "openid"
++  gem "ruby-openid", ">= 2.9.2", :require => "openid"
+   gem "rack-openid"
+ end
+ 
+ platforms :mri, :mingw, :x64_mingw do
+   # Optional gem for exporting the gantt to a PNG file, not supported with jruby
+   group :rmagick do
+-    gem "rmagick", "~> 2.16.0"
++    gem "rmagick", ">= 2.16.0"
+   end
+ 
+   # Optional Markdown support, not for JRuby
+   group :markdown do
+-    gem "redcarpet", "~> 3.4.0"
++    gem "redcarpet", ">= 3.4.0"
+   end
+ end
+ 
+@@ -58,11 +57,11 @@
+     adapters.each do |adapter|
+       case adapter
+       when 'mysql2'
+-        gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
++        gem "mysql2", ">= 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
+       when /postgresql/
+-        gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw]
++        gem "pg", ">= 1.1.4", :platforms => [:mri, :mingw, :x64_mingw]
+       when /sqlite3/
+-        gem "sqlite3", "~>1.3.12", :platforms => [:mri, :mingw, :x64_mingw]
++        gem "sqlite3", ">= 1.3.12", :platforms => [:mri, :mingw, :x64_mingw]
+       when /sqlserver/
+         gem "tiny_tds", "~> 1.0.5", :platforms => [:mri, :mingw, :x64_mingw]
+         gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]

diff --git a/www-apps/redmine/redmine-4.0.5.ebuild b/www-apps/redmine/redmine-4.0.5.ebuild
new file mode 100644
index 00000000000..494fd300228
--- /dev/null
+++ b/www-apps/redmine/redmine-4.0.5.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24"
+inherit eutils depend.apache ruby-ng
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="https://www.redmine.org/"
+SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
+
+ruby_add_rdepend "
+	imagemagick? ( dev-ruby/rmagick:0 )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	markdown? ( >=dev-ruby/redcarpet-3.4.0 )
+	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
+	postgres? ( >=dev-ruby/pg-1.1.4:1 )
+	sqlite? ( >=dev-ruby/sqlite3-1.3.12 )
+	dev-ruby/actionpack-xml_parser:*
+	dev-ruby/i18n:0.7
+	>=dev-ruby/mail-2.7.1
+	dev-ruby/mimemagic
+	>=dev-ruby/mini_mime-1.0.1
+	>=dev-ruby/nokogiri-1.10.0
+	dev-ruby/rails:5.2
+	>=dev-ruby/rbpdf-1.19.6
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.3.0
+	>=dev-ruby/rouge-3.6.0
+	>=dev-ruby/ruby-openid-2.9.2
+	dev-ruby/rack-openid
+"
+
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+all_ruby_prepare() {
+	rm -r log files/delete.me .github || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	# newenvd not working here
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# Fixing versions in Gemfile
+	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
+
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		# remove ldap stuff module if disabled to avoid #413779
+		use ldap || rm app/models/auth_source_ldap.rb || die
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem \"fcgi\"" > Gemfile.local
+	fi
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	# Remove old lock file
+	rm -f "${EROOT%/}${REDMINE_DIR}/Gemfile.lock"
+
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	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
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${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 "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		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 redmine:plugins:migrate || die
+		einfo "Clear the cache."
+		${RUBY} -S rake tmp:cache:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${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 data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine -R "${EROOT%/}/var/log/redmine/" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/redmine/, www-apps/redmine/files/
@ 2018-05-25 22:38 Aaron Bauman
  0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2018-05-25 22:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5a985b6fcfa46754da0d7dda4f797996dcd7f037
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed May 23 20:08:00 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri May 25 22:37:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a985b6f

www-apps/redmine: version bump and fixes

Bump to 3.3.7 and 3.4.5. Branch 3.2 support officialy discontinued,
removed. Fixes dependencies conflict that prevents launch application
with installed but unsupported gems (#645178 and #652880). Fixes bug
when fresh installation cannot be configured.

Closes: https://bugs.gentoo.org/645178
Closes: https://bugs.gentoo.org/652880
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/8539

 www-apps/redmine/Manifest                          |   5 +-
 .../files/redmine-3.3.7_gemfile_versions.patch     |  44 +++++
 .../redmine/files/redmine-3.4.3_requires.patch     |  73 -------
 .../files/redmine-3.4.5_gemfile_versions.patch     |  41 ++++
 www-apps/redmine/redmine-3.3.6.ebuild              | 219 ---------------------
 .../{redmine-3.4.4.ebuild => redmine-3.3.7.ebuild} |  36 ++--
 .../{redmine-3.2.9.ebuild => redmine-3.4.5.ebuild} |  39 ++--
 7 files changed, 130 insertions(+), 327 deletions(-)

diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index dcdd6872f69..1aa30ff383b 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,3 +1,2 @@
-DIST redmine-3.2.9.tar.gz 2323496 BLAKE2B 16aea04eb8ddbe4e97c95f32ad62c6d4332001d7e8afd0b842cc76f9f1dc492b48e1dc11c8017d635520fbccda6e1044ced8be51435f76db24482bf11b5a70d9 SHA512 0bf52f245a08cfd66acd07fe849cfac7a460623cdd223806ee4c7c9c3d17753c1b2914b7bcdc950ac8401ba54c004e399f685d38946b1fbe2259943de5a18f29
-DIST redmine-3.3.6.tar.gz 2371226 BLAKE2B 4465ebf3d89e05a8c53f59b11190eb290a152e6a11fa08a210c471f31e857c3c21ce226e056be00dec7bb5b78172a929969e1cae410ce9fa4c03280c427e99c2 SHA512 124a74ccbe9e66460551fc0fb9feb5b72237c5b711463b467d665fd973c3f0a06f63c708629716401f9997cefc1c3060d64c73917d3791750b4340eda69c8848
-DIST redmine-3.4.4.tar.gz 2447358 BLAKE2B 1f5aa3c24e06029405c59e25c40c98975c98033658ee0a931b1fa95aac54187c7304f1fc0af4805226c4ef274f85d89856ffd39b0ae71b34337865d3e8f4a5ff SHA512 12bf58aade53c02df35b33ba62dd97091a5ac20fb6ef0f16f046226c62dfd06fc6cea5451f433e00f7d9374c158035dc5457d65eafdbc35a90199c5a407c7752
+DIST redmine-3.3.7.tar.gz 2371716 BLAKE2B ba1e69419f846ddfa64ddc5d26fda281737501374f5aa4f79bd4c59d5b483a28070103fcc3bf2f3b1c7a4ce96dbfb32d1d1f21a6b74603aad012ce7d2e3373ed SHA512 ba106eb60587788ccd3162274a9a40d2876324e647e1fcafce0f943d69d8fe216a01cbddb2a5a4f41f64513e287c80ec518cef5a6033b3d1ed0bcfc7d1cfcc64
+DIST redmine-3.4.5.tar.gz 2448231 BLAKE2B 11041cbac5ea33c060a90ead56a4479cc86137bad5e0eb6135aed8d19059aedecd2ad52ac63ae6fcc5bbb13b5fc4cd6b05695aff484932b55ad5d7be7cb1c396 SHA512 c77ce76fadb7a2b9d6daf77a898a1ca4d7b1c8616922e89026cee3a4b0ec1a187a746f0a054b786663e78fc510596be736fd12d71b2569f6a63a21d0c95a05ad

diff --git a/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch b/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch
new file mode 100644
index 00000000000..c338a385a96
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch
@@ -0,0 +1,44 @@
+diff -Nuar redmine-3.3.7.orig/Gemfile redmine-3.3.7/Gemfile
+--- redmine-3.3.7.orig/Gemfile	2018-05-23 22:36:30.756737829 +0300
++++ redmine-3.3.7/Gemfile	2018-05-23 22:42:20.227720874 +0300
+@@ -4,7 +4,7 @@
+   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
+ end
+ 
+-gem "rails", "4.2.7.1"
++gem "rails", "~> 4.2.10"
+ gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
+ if RUBY_VERSION < "2.1"
+   gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
+@@ -17,12 +17,12 @@
+ gem "protected_attributes"
+ gem "actionpack-action_caching"
+ gem "actionpack-xml_parser"
+-gem "roadie-rails", "~> 1.1.1"
+-gem "roadie", "~> 3.2.1"
++gem "roadie-rails", "~> 1.2.1"
++gem "roadie", "~> 3.3"
+ gem "mimemagic"
+-gem "mail", "~> 2.6.4"
++gem "mail", "~> 2.7"
+ 
+-gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
++gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.2" : "~> 1.6.8")
+ gem "i18n", "~> 0.7.0"
+ gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
+ 
+@@ -35,12 +35,12 @@
+ 
+ # Optional gem for LDAP authentication
+ group :ldap do
+-  gem "net-ldap", "~> 0.12.0"
++  gem "net-ldap", "~> 0.16.0"
+ end
+ 
+ # Optional gem for OpenID authentication
+ group :openid do
+-  gem "ruby-openid", "~> 2.3.0", :require => "openid"
++  gem "ruby-openid", "~> 2.7.0", :require => "openid"
+   gem "rack-openid"
+ end
+ 

diff --git a/www-apps/redmine/files/redmine-3.4.3_requires.patch b/www-apps/redmine/files/redmine-3.4.3_requires.patch
deleted file mode 100644
index 338f627adb1..00000000000
--- a/www-apps/redmine/files/redmine-3.4.3_requires.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Nuar redmine-3.4.3-orig/app/controllers/application_controller.rb redmine-3.4.3/app/controllers/application_controller.rb
---- redmine-3.4.3-orig/app/controllers/application_controller.rb	2017-12-11 20:55:04.942299001 +0500
-+++ redmine-3.4.3/app/controllers/application_controller.rb	2017-12-11 20:55:17.285298402 +0500
-@@ -15,6 +15,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'request_store'
- require 'uri'
- require 'cgi'
- 
-diff -Nuar redmine-3.4.3-orig/app/controllers/welcome_controller.rb redmine-3.4.3/app/controllers/welcome_controller.rb
---- redmine-3.4.3-orig/app/controllers/welcome_controller.rb	2017-12-11 20:55:04.942299001 +0500
-+++ redmine-3.4.3/app/controllers/welcome_controller.rb	2017-12-11 20:55:17.286298402 +0500
-@@ -15,6 +15,9 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'action_controller'
-+require 'action_controller/action_caching'
-+
- class WelcomeController < ApplicationController
-   self.main_menu = false
- 
-diff -Nuar redmine-3.4.3-orig/app/models/custom_field.rb redmine-3.4.3/app/models/custom_field.rb
---- redmine-3.4.3-orig/app/models/custom_field.rb	2017-12-11 20:55:04.926299002 +0500
-+++ redmine-3.4.3/app/models/custom_field.rb	2017-12-11 20:55:17.286298402 +0500
-@@ -15,6 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'protected_attributes'
-+
- class CustomField < ActiveRecord::Base
-   include Redmine::SafeAttributes
-   include Redmine::SubclassFactory
-diff -Nuar redmine-3.4.3-orig/app/models/mailer.rb redmine-3.4.3/app/models/mailer.rb
---- redmine-3.4.3-orig/app/models/mailer.rb	2017-12-11 20:55:04.926299002 +0500
-+++ redmine-3.4.3/app/models/mailer.rb	2017-12-11 20:55:17.286298402 +0500
-@@ -16,6 +16,7 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
- require 'roadie'
-+require 'roadie-rails'
- 
- class Mailer < ActionMailer::Base
-   layout 'mailer'
-diff -Nuar redmine-3.4.3-orig/bin/rails redmine-3.4.3/bin/rails
---- redmine-3.4.3-orig/bin/rails	2017-12-11 20:55:04.986298999 +0500
-+++ redmine-3.4.3/bin/rails	2017-12-11 20:58:40.247288555 +0500
-@@ -1,4 +1,6 @@
- #!/usr/bin/env ruby
- APP_PATH = File.expand_path('../../config/application',  __FILE__)
- require_relative '../config/boot'
-+
-+gem 'rails', '~> 4.2'
- require 'rails/commands'
-diff -Nuar redmine-3.4.3-orig/config/application.rb redmine-3.4.3/config/application.rb
---- redmine-3.4.3-orig/config/application.rb	2017-12-11 20:55:04.971298999 +0500
-+++ redmine-3.4.3/config/application.rb	2017-12-11 20:58:20.477289514 +0500
-@@ -1,8 +1,11 @@
- require File.expand_path('../boot', __FILE__)
- 
-+gem 'rails', '~> 4.2'
-+gem 'actionpack-xml_parser', '~> 1.0'
-+
- require 'rails/all'
-+require 'action_dispatch/xml_params_parser'
- 
--Bundler.require(*Rails.groups)
- 
- module RedmineApp
-   class Application < Rails::Application

diff --git a/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch b/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch
new file mode 100644
index 00000000000..df49ccbe1dc
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch
@@ -0,0 +1,41 @@
+diff -Nuar redmine-3.4.5.orig/Gemfile redmine-3.4.5/Gemfile
+--- redmine-3.4.5.orig/Gemfile	2018-05-23 02:01:54.591358114 +0300
++++ redmine-3.4.5/Gemfile	2018-05-23 02:05:19.531348171 +0300
+@@ -4,7 +4,7 @@
+   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
+ end
+ 
+-gem "rails", "4.2.8"
++gem "rails", "~> 4.2.10"
+ gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
+ if RUBY_VERSION < "2.1"
+   gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
+@@ -15,10 +15,10 @@
+ gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
+ gem "protected_attributes"
+ gem "actionpack-xml_parser"
+-gem "roadie-rails", "~> 1.1.1"
+-gem "roadie", "~> 3.2.1"
++gem "roadie-rails", "~> 1.2.1"
++gem "roadie", "~> 3.3"
+ gem "mimemagic"
+-gem "mail", "~> 2.6.4"
++gem "mail", "~> 2.7"
+ 
+ gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8")
+ gem "i18n", "~> 0.7.0"
+@@ -33,12 +33,12 @@
+ 
+ # Optional gem for LDAP authentication
+ group :ldap do
+-  gem "net-ldap", "~> 0.12.0"
++  gem "net-ldap", "~> 0.16.0"
+ end
+ 
+ # Optional gem for OpenID authentication
+ group :openid do
+-  gem "ruby-openid", "~> 2.3.0", :require => "openid"
++  gem "ruby-openid", "~> 2.7", :require => "openid"
+   gem "rack-openid"
+ end
+ 

diff --git a/www-apps/redmine/redmine-3.3.6.ebuild b/www-apps/redmine/redmine-3.3.6.ebuild
deleted file mode 100644
index c3b226cd21c..00000000000
--- a/www-apps/redmine/redmine-3.3.6.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="https://www.redmine.org/"
-SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
-
-ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
-	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
-	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
-	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	passenger? ( www-apache/passenger )
-	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT%/}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-}
-
-pkg_config() {
-	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	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
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT%/}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT%/}${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 "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		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 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
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${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 data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}

diff --git a/www-apps/redmine/redmine-3.4.4.ebuild b/www-apps/redmine/redmine-3.3.7.ebuild
similarity index 89%
rename from www-apps/redmine/redmine-3.4.4.ebuild
rename to www-apps/redmine/redmine-3.3.7.ebuild
index c914e4add20..be96b570398 100644
--- a/www-apps/redmine/redmine-3.4.4.ebuild
+++ b/www-apps/redmine/redmine-3.3.7.ebuild
@@ -12,10 +12,7 @@ SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
+IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
 ruby_add_rdepend "
 	dev-ruby/actionpack-action_caching
@@ -41,16 +38,11 @@ ruby_add_rdepend "
 	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
 	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
 	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	mysql? ( dev-ruby/mysql2:0.4 )
 	passenger? ( www-apache/passenger )
+	postgres? ( dev-ruby/pg:0 )
+	sqlite? ( dev-ruby/sqlite3 )
 	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
 
 REDMINE_DIR="/var/lib/${PN}"
 
@@ -60,7 +52,7 @@ pkg_setup() {
 }
 
 all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
+	rm -r log files/delete.me || die
 
 	# bug #406605
 	rm .{git,hg}ignore || die
@@ -73,7 +65,21 @@ all_ruby_prepare() {
 	# remove ldap staff module if disabled to avoid #413779
 	use ldap || rm app/models/auth_source_ldap.rb || die
 
-	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
+	# Fixing versions in Gemfile
+	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
+
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
 }
 
 all_ruby_install() {
@@ -206,7 +212,7 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration data."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		chown redmine:redmine -R "${EROOT%/}var/log/redmine/" || die
 		einfo
 		einfo "If you use sqlite3, please do not forget to change the ownership"
 		einfo "of the sqlite files."

diff --git a/www-apps/redmine/redmine-3.2.9.ebuild b/www-apps/redmine/redmine-3.4.5.ebuild
similarity index 88%
rename from www-apps/redmine/redmine-3.2.9.ebuild
rename to www-apps/redmine/redmine-3.4.5.ebuild
index c3b226cd21c..d78641a9295 100644
--- a/www-apps/redmine/redmine-3.2.9.ebuild
+++ b/www-apps/redmine/redmine-3.4.5.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 inherit eutils depend.apache ruby-ng user
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
@@ -13,10 +12,7 @@ SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
+IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
 ruby_add_rdepend "
 	dev-ruby/actionpack-action_caching
@@ -42,16 +38,11 @@ ruby_add_rdepend "
 	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
 	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
 	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	mysql? ( dev-ruby/mysql2:0.4 )
 	passenger? ( www-apache/passenger )
+	postgres? ( dev-ruby/pg:0 )
+	sqlite? ( dev-ruby/sqlite3 )
 	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
 
 REDMINE_DIR="/var/lib/${PN}"
 
@@ -61,7 +52,7 @@ pkg_setup() {
 }
 
 all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
+	rm -r log files/delete.me .github || die
 
 	# bug #406605
 	rm .{git,hg}ignore || die
@@ -74,7 +65,21 @@ all_ruby_prepare() {
 	# remove ldap staff module if disabled to avoid #413779
 	use ldap || rm app/models/auth_source_ldap.rb || die
 
-	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
+	# Fixing versions in Gemfile
+	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
+
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
 }
 
 all_ruby_install() {
@@ -207,7 +212,7 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration data."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		chown redmine:redmine -R "${EROOT%/}var/log/redmine/" || die
 		einfo
 		einfo "If you use sqlite3, please do not forget to change the ownership"
 		einfo "of the sqlite files."


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/redmine/, www-apps/redmine/files/
@ 2018-01-26  0:20 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2018-01-26  0:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2e1acd2130ed4110cbe04a30050023a9eb44a51e
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu Jan 25 23:43:08 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 00:19:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e1acd21

www-apps/redmine: strict certain versions for deps

Modified *_requires.patch to strict rails to 4.2 and actionpack-xml_parser
to 1.0 during configuration and execution.

Bug: https://bugs.gentoo.org/636210
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../redmine/files/redmine-3.3.4_requires.patch     |  60 ------------
 .../redmine/files/redmine-3.4.3_requires.patch     |  73 ++++++++++++++
 www-apps/redmine/redmine-3.2.8.ebuild              | 106 +++++++++++----------
 www-apps/redmine/redmine-3.3.5.ebuild              |   2 +-
 www-apps/redmine/redmine-3.4.3.ebuild              |   4 +-
 5 files changed, 133 insertions(+), 112 deletions(-)

diff --git a/www-apps/redmine/files/redmine-3.3.4_requires.patch b/www-apps/redmine/files/redmine-3.3.4_requires.patch
deleted file mode 100644
index e4510839cf4..00000000000
--- a/www-apps/redmine/files/redmine-3.3.4_requires.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nuar redmine-3.3.3-orig/app/controllers/application_controller.rb redmine-3.3.3/app/controllers/application_controller.rb
---- redmine-3.3.3-orig/app/controllers/application_controller.rb	2017-05-24 21:05:03.515966923 +0500
-+++ redmine-3.3.3/app/controllers/application_controller.rb	2017-05-24 21:07:22.629960174 +0500
-@@ -15,6 +15,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'request_store'
- require 'uri'
- require 'cgi'
- 
-diff -Nuar redmine-3.3.3-orig/app/controllers/welcome_controller.rb redmine-3.3.3/app/controllers/welcome_controller.rb
---- redmine-3.3.3-orig/app/controllers/welcome_controller.rb	2017-05-24 21:05:03.514966923 +0500
-+++ redmine-3.3.3/app/controllers/welcome_controller.rb	2017-05-24 21:08:14.895957638 +0500
-@@ -15,6 +15,9 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'action_controller'
-+require 'action_controller/action_caching'
-+
- class WelcomeController < ApplicationController
-   caches_action :robots
- 
-diff -Nuar redmine-3.3.3-orig/app/models/custom_field.rb redmine-3.3.3/app/models/custom_field.rb
---- redmine-3.3.3-orig/app/models/custom_field.rb	2017-05-24 21:05:03.513966923 +0500
-+++ redmine-3.3.3/app/models/custom_field.rb	2017-05-24 21:08:32.223956797 +0500
-@@ -15,6 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'protected_attributes'
-+
- class CustomField < ActiveRecord::Base
-   include Redmine::SubclassFactory
- 
-diff -Nuar redmine-3.3.3-orig/app/models/mailer.rb redmine-3.3.3/app/models/mailer.rb
---- redmine-3.3.3-orig/app/models/mailer.rb	2017-05-24 21:05:03.514966923 +0500
-+++ redmine-3.3.3/app/models/mailer.rb	2017-05-24 21:05:47.039964812 +0500
-@@ -16,6 +16,7 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
- require 'roadie'
-+require 'roadie-rails'
- 
- class Mailer < ActionMailer::Base
-   layout 'mailer'
-diff -Nuar redmine-3.3.3-orig/config/application.rb redmine-3.3.3/config/application.rb
---- redmine-3.3.3-orig/config/application.rb	2017-05-24 21:05:03.689966915 +0500
-+++ redmine-3.3.3/config/application.rb	2017-05-24 21:05:35.723965361 +0500
-@@ -1,8 +1,8 @@
- require File.expand_path('../boot', __FILE__)
- 
- require 'rails/all'
-+require 'action_dispatch/xml_params_parser'
- 
--Bundler.require(*Rails.groups)
- 
- module RedmineApp
-   class Application < Rails::Application

diff --git a/www-apps/redmine/files/redmine-3.4.3_requires.patch b/www-apps/redmine/files/redmine-3.4.3_requires.patch
new file mode 100644
index 00000000000..338f627adb1
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.4.3_requires.patch
@@ -0,0 +1,73 @@
+diff -Nuar redmine-3.4.3-orig/app/controllers/application_controller.rb redmine-3.4.3/app/controllers/application_controller.rb
+--- redmine-3.4.3-orig/app/controllers/application_controller.rb	2017-12-11 20:55:04.942299001 +0500
++++ redmine-3.4.3/app/controllers/application_controller.rb	2017-12-11 20:55:17.285298402 +0500
+@@ -15,6 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
++require 'request_store'
+ require 'uri'
+ require 'cgi'
+ 
+diff -Nuar redmine-3.4.3-orig/app/controllers/welcome_controller.rb redmine-3.4.3/app/controllers/welcome_controller.rb
+--- redmine-3.4.3-orig/app/controllers/welcome_controller.rb	2017-12-11 20:55:04.942299001 +0500
++++ redmine-3.4.3/app/controllers/welcome_controller.rb	2017-12-11 20:55:17.286298402 +0500
+@@ -15,6 +15,9 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
++require 'action_controller'
++require 'action_controller/action_caching'
++
+ class WelcomeController < ApplicationController
+   self.main_menu = false
+ 
+diff -Nuar redmine-3.4.3-orig/app/models/custom_field.rb redmine-3.4.3/app/models/custom_field.rb
+--- redmine-3.4.3-orig/app/models/custom_field.rb	2017-12-11 20:55:04.926299002 +0500
++++ redmine-3.4.3/app/models/custom_field.rb	2017-12-11 20:55:17.286298402 +0500
+@@ -15,6 +15,8 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
++require 'protected_attributes'
++
+ class CustomField < ActiveRecord::Base
+   include Redmine::SafeAttributes
+   include Redmine::SubclassFactory
+diff -Nuar redmine-3.4.3-orig/app/models/mailer.rb redmine-3.4.3/app/models/mailer.rb
+--- redmine-3.4.3-orig/app/models/mailer.rb	2017-12-11 20:55:04.926299002 +0500
++++ redmine-3.4.3/app/models/mailer.rb	2017-12-11 20:55:17.286298402 +0500
+@@ -16,6 +16,7 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+ require 'roadie'
++require 'roadie-rails'
+ 
+ class Mailer < ActionMailer::Base
+   layout 'mailer'
+diff -Nuar redmine-3.4.3-orig/bin/rails redmine-3.4.3/bin/rails
+--- redmine-3.4.3-orig/bin/rails	2017-12-11 20:55:04.986298999 +0500
++++ redmine-3.4.3/bin/rails	2017-12-11 20:58:40.247288555 +0500
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env ruby
+ APP_PATH = File.expand_path('../../config/application',  __FILE__)
+ require_relative '../config/boot'
++
++gem 'rails', '~> 4.2'
+ require 'rails/commands'
+diff -Nuar redmine-3.4.3-orig/config/application.rb redmine-3.4.3/config/application.rb
+--- redmine-3.4.3-orig/config/application.rb	2017-12-11 20:55:04.971298999 +0500
++++ redmine-3.4.3/config/application.rb	2017-12-11 20:58:20.477289514 +0500
+@@ -1,8 +1,11 @@
+ require File.expand_path('../boot', __FILE__)
+ 
++gem 'rails', '~> 4.2'
++gem 'actionpack-xml_parser', '~> 1.0'
++
+ require 'rails/all'
++require 'action_dispatch/xml_params_parser'
+ 
+-Bundler.require(*Rails.groups)
+ 
+ module RedmineApp
+   class Application < Rails::Application

diff --git a/www-apps/redmine/redmine-3.2.8.ebuild b/www-apps/redmine/redmine-3.2.8.ebuild
index c0bd7c7e880..951845e783f 100644
--- a/www-apps/redmine/redmine-3.2.8.ebuild
+++ b/www-apps/redmine/redmine-3.2.8.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+# ruby24 don't have required deps
 USE_RUBY="ruby22 ruby23"
 inherit eutils depend.apache ruby-ng user
 
@@ -15,42 +16,41 @@ SLOT="0"
 # All db-related USEs are ineffective since we depend on rails
 # which depends on activerecord which depends on all ruby's db bindings
 #IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="ldap fastcgi passenger imagemagick"
+IUSE="imagemagick fastcgi ldap markdown passenger"
 
 ruby_add_rdepend "
-	dev-ruby/rubygems
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/jquery-rails-3.1.4:3
-	>=dev-ruby/coderay-1.1.0
-	>=dev-ruby/builder-3.0.4:*
-	>=dev-ruby/roadie-rails-1.1.0
-	dev-ruby/mime-types:*
-	=dev-ruby/request_store-1.0.5
-	>=dev-ruby/rbpdf-1.19.0
 	dev-ruby/actionpack-action_caching
 	dev-ruby/actionpack-xml_parser:0
+	>=dev-ruby/builder-3.2.2:3.2
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/i18n:0.7
+	>=dev-ruby/jquery-rails-3.1.4:3
+	dev-ruby/loofah
+	dev-ruby/mime-types:*
+	dev-ruby/mimemagic
+	>=dev-ruby/nokogiri-1.6.8
 	dev-ruby/protected_attributes
-	>=dev-ruby/redcarpet-3.3.2
-	>=dev-ruby/nokogiri-1.6.7.2
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	>=dev-ruby/ruby-openid-2.3.0
 	>=dev-ruby/rack-openid-0.2.1
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/rails-html-sanitizer-1.0.3
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.1.0
+	>=dev-ruby/rbpdf-1.19.2
+	>=dev-ruby/ruby-openid-2.3.0
+	dev-ruby/rubygems
 	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
 	passenger? ( www-apache/passenger )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )"
-	#	ruby_targets_ruby19? (
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql2:0.3 )
-#	)
-
+	"
+# TODO add USE doc and test
 #ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
 #	dev-ruby/yard
 #	test? (
 #		>=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}"
@@ -66,26 +66,20 @@ all_ruby_prepare() {
 	# bug #406605
 	rm .{git,hg}ignore || die
 
-	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}"
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
 
 	# remove ldap staff module if disabled to avoid #413779
 	use ldap || rm app/models/auth_source_ldap.rb || die
 
-	# Make it work
-	sed -i -e "1irequire 'request_store'" app/controllers/application_controller.rb || die
-	sed -i -e "18irequire 'action_controller'" -e "19irequire 'action_controller/action_caching'"\
-		app/controllers/welcome_controller.rb || die
-	sed -i -e "4irequire 'action_dispatch/xml_params_parser'" -e "/Bundler/d" config/application.rb || die
-	sed -i -e "18irequire 'protected_attributes'" app/models/custom_field.rb || die
-	sed -i -e "19irequire 'roadie-rails'" app/models/mailer.rb || die
+	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
 }
 
 all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
-	rm -r doc || die
-	dodoc README.rdoc
-	rm README.rdoc || die
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
 
 	keepdir /var/log/${PN}
 
@@ -128,7 +122,9 @@ all_ruby_install() {
 }
 
 pkg_postinst() {
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
 		elog "Execute the following command to upgrade environment:"
 		elog
 		elog "# emerge --config \"=${CATEGORY}/${PF}\""
@@ -138,7 +134,7 @@ pkg_postinst() {
 	else
 		elog "Execute the following command to initialize environment:"
 		elog
-		elog "# cd ${EPREFIX}${REDMINE_DIR}"
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
 		elog "# cp config/database.yml.example config/database.yml"
 		elog "# \${EDITOR} config/database.yml"
 		elog "# chown redmine:redmine config/database.yml"
@@ -150,38 +146,49 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	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."
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
 		die
 	fi
 
 	local RAILS_ENV=${RAILS_ENV:-production}
-	if [ ! -L /usr/bin/ruby ]; then
+	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
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]; then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets: ${RUBY_TARGETS}."
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
 		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
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${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
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
 		einfo
 		einfo "Upgrading database."
 		einfo
 
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
 		einfo "Migrating database."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Upgrading the plugin migrations."
@@ -200,11 +207,12 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration data."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EPREFIX}${REDMINE_DIR}"/log/production.log
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
 		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
 		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
 		einfo "# chown redmine:redmine db/ db/*.sqlite3"
 		einfo
 	fi

diff --git a/www-apps/redmine/redmine-3.3.5.ebuild b/www-apps/redmine/redmine-3.3.5.ebuild
index 80dcfc03248..951845e783f 100644
--- a/www-apps/redmine/redmine-3.3.5.ebuild
+++ b/www-apps/redmine/redmine-3.3.5.ebuild
@@ -74,7 +74,7 @@ all_ruby_prepare() {
 	# remove ldap staff module if disabled to avoid #413779
 	use ldap || rm app/models/auth_source_ldap.rb || die
 
-	eapply "${FILESDIR}/${P}_requires.patch"
+	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
 }
 
 all_ruby_install() {

diff --git a/www-apps/redmine/redmine-3.4.3.ebuild b/www-apps/redmine/redmine-3.4.3.ebuild
index d2e874a23be..80dcfc03248 100644
--- a/www-apps/redmine/redmine-3.4.3.ebuild
+++ b/www-apps/redmine/redmine-3.4.3.ebuild
@@ -20,7 +20,7 @@ IUSE="imagemagick fastcgi ldap markdown passenger"
 
 ruby_add_rdepend "
 	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:*
+	dev-ruby/actionpack-xml_parser:0
 	>=dev-ruby/builder-3.2.2:3.2
 	>=dev-ruby/coderay-1.1.0
 	dev-ruby/i18n:0.7
@@ -74,7 +74,7 @@ all_ruby_prepare() {
 	# remove ldap staff module if disabled to avoid #413779
 	use ldap || rm app/models/auth_source_ldap.rb || die
 
-	eapply "${FILESDIR}/${PN}-3.3.4_requires.patch"
+	eapply "${FILESDIR}/${P}_requires.patch"
 }
 
 all_ruby_install() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-12-24  7:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-15 10:57 [gentoo-commits] repo/gentoo:master commit in: www-apps/redmine/, www-apps/redmine/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2022-12-24  7:42 Sam James
2022-07-15 15:08 Sam James
2019-12-08  8:41 Joonas Niilola
2018-05-25 22:38 Aaron Bauman
2018-01-26  0:20 Thomas Deutschmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox