commit: 118747fdd2fa232f4d11ef2a032c1107e5775a0a Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Fri May 5 11:59:05 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Jul 14 21:56:38 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118747fd
www-apps/redmine: Bump to 3.2.7, 3.3.4, 3.4.0. Fixed slot dependencies, startup script (Bug #603452), added new log location and logrotate, added myself to proxied maintainers (Bug Closes: https://github.com/gentoo/gentoo/pull/4550 Package-Manager: Portage-2.3.3, Repoman-2.3.1 www-apps/redmine/Manifest | 4 +- www-apps/redmine/files/additional_environment.rb | 7 ++ .../redmine/files/redmine-3.3.4_requires.patch | 60 ++++++++++ .../files/{redmine-2.initd => redmine-3.initd} | 21 ++-- www-apps/redmine/files/redmine.logrotate | 9 ++ www-apps/redmine/metadata.xml | 11 +- .../{redmine-3.2.1.ebuild => redmine-3.2.7.ebuild} | 15 ++- .../{redmine-3.2.1.ebuild => redmine-3.3.4.ebuild} | 129 +++++++++++---------- .../{redmine-3.2.1.ebuild => redmine-3.4.0.ebuild} | 129 +++++++++++---------- 9 files changed, 247 insertions(+), 138 deletions(-) diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest index 18c8c6ff367..a526cfd2a74 100644 --- a/www-apps/redmine/Manifest +++ b/www-apps/redmine/Manifest @@ -1 +1,3 @@ -DIST redmine-3.2.1.tar.gz 2310459 SHA256 5e69ad50eef27b581e58ea0d72f2dcb19f38db3626e3bd6ed27b74d5a4da5bd6 SHA512 20bc63f82aa58a67c10733338e7aebae3348689531f1f0a6dbedb00301f128ef6a29bd6a33d3075b614e01b23f5311a9739b251fb911298e54d4df06df628bf3 WHIRLPOOL b900978ffe6374cefaa8eab9b711e3062559f5579d241edc6381190d3a6ae1f449ca7a13253914c9cd954d064d4b83e9b7ebc4aed5ff62dcf4d4a2022351ba1e +DIST redmine-3.2.7.tar.gz 2322680 SHA256 f6ec163474e2a2cac21215d130c5bd3ccee54019165052943feaffc5fe5b34fc SHA512 74eb67e25a835500c7eb1c251de824981d45402fa04d03801c16ed2e3a78d90e3eee414063fd95379749335714e72c34760a251b3a583176e76cb9398e24b711 WHIRLPOOL 61dd4497d290b6f88fa4332119b9e2c0fcf27a727f5cb727f2700153eef6fac5e088a77d5f120e77f3a59f53e2de1fa9ad6eb03a0cfb2aba3ecf4eb2998dc9ff +DIST redmine-3.3.4.tar.gz 2367776 SHA256 f28125f31df7ebcf7debf9b030d62002e2757c6ed228882ac64562dec90efbac SHA512 152806f829ba7e4f8df18933aa9d46c959e9f314a5698b20f30b90bb0d1292439fd6a3dfaea427145273d3fd37d48f62a64068dd7f8ab1cbe507eaf5c09f7f2e WHIRLPOOL 5a61eb7ba1dfd56cc3564488ee4a3686876cfea6fe83b624a0014588a27e6623b6ed5bcfe668e92b1edf26895b3d9f6c88edccca9629539147649aa7f197ba22 +DIST redmine-3.4.0.tar.gz 2437695 SHA256 007b274a9757686ab2e98d3f56bc8adfcc817641593dac1ca20218993be4a6c0 SHA512 7b1ea2242582fb0c2a85592399d91736d1fe36527fc6c7d3f4dad262e492c5fc53729b492235289bad9b0f254cfc0f631e1f733b2e77f4e9260feba99e6dcf5c WHIRLPOOL d5971874fa1afada9d6701c60c59ec80efa1151c9a198c8833bd850171632b29fb1dc658f5e15727994db111e23fb7983eda62ac6b4506e634bbff5de5d8902b diff --git a/www-apps/redmine/files/additional_environment.rb b/www-apps/redmine/files/additional_environment.rb new file mode 100644 index 00000000000..a4e9baf758a --- /dev/null +++ b/www-apps/redmine/files/additional_environment.rb @@ -0,0 +1,7 @@ +# Copy this file to additional_environment.rb and add any statements +# that need to be passed to the Rails::Initializer. `config` is +# available in this context. + +# Place log-files to /var/log/redmine +config.logger = Logger.new(Rails.root.join("/var/log/redmine",Rails.env + ".log"), 0, 10485760) +config.log_level= :info diff --git a/www-apps/redmine/files/redmine-3.3.4_requires.patch b/www-apps/redmine/files/redmine-3.3.4_requires.patch new file mode 100644 index 00000000000..e4510839cf4 --- /dev/null +++ b/www-apps/redmine/files/redmine-3.3.4_requires.patch @@ -0,0 +1,60 @@ +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-2.initd b/www-apps/redmine/files/redmine-3.initd similarity index 59% rename from www-apps/redmine/files/redmine-2.initd rename to www-apps/redmine/files/redmine-3.initd index 72ad1007992..507987034be 100644 --- a/www-apps/redmine/files/redmine-2.initd +++ b/www-apps/redmine/files/redmine-3.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 RAILS_ENV=${RAILS_ENV:-production} @@ -11,30 +11,28 @@ REDMINE_GROUP=${REDMINE_GROUP:-redmine} REDMINE_PIDFILE="/var/run/redmine/server.pid" depend() { - use apache2 git-daemon mysql net postgresql svnserve + use git-daemon mysql net postgresql svnserve } start_pre() { if [ ! -e "${REDMINE_DIR}/config/initializers/secret_token.rb" ] ; then - eerror "Execute the following command to initlize environment:" + eerror "Execute the following command to initialize environment:" eerror eerror "# emerge --config www-apps/redmine" eerror return 1 fi - if [ ! -d /var/run/redmine ]; then - checkpath -q -d -m 0755 -o redmine:redmine /var/run/redmine - fi + checkpath -q -d -m 0755 -o redmine:redmine /var/run/redmine } start() { ebegin "Starting redmine" - cd "${REDMINE_DIR}" - start-stop-daemon --start --quiet --user ${REDMINE_USER}:${REDMINE_GROUP} \ + start-stop-daemon --start --quiet \ + --user "${REDMINE_USER}:${REDMINE_GROUP}" \ --pidfile "${REDMINE_PIDFILE}" \ - --exec /usr/bin/ruby "${REDMINE_DIR}"/script/rails server -- \ - --daemon --environment=${RAILS_ENV} \ - --binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \ + --exec /usr/bin/ruby "${REDMINE_DIR}"/bin/rails server -- \ + --daemon --environment="${RAILS_ENV}" \ + --binding="${REDMINE_ADDRESS}" --port="${REDMINE_PORT}" \ --pid="${REDMINE_PIDFILE}" \ ${REDMINE_OPTS} eend $? @@ -42,7 +40,6 @@ start() { stop() { ebegin "Stopping redmine" - cd "${REDMINE_DIR}" start-stop-daemon --signal INT --quiet --pidfile "${REDMINE_PIDFILE}" eend $? } diff --git a/www-apps/redmine/files/redmine.logrotate b/www-apps/redmine/files/redmine.logrotate new file mode 100644 index 00000000000..69e98cb3fc6 --- /dev/null +++ b/www-apps/redmine/files/redmine.logrotate @@ -0,0 +1,9 @@ +/var/log/redmine/*.log { + daily + missingok + rotate 7 + compress + delaycompress + notifempty + copytruncate +} diff --git a/www-apps/redmine/metadata.xml b/www-apps/redmine/metadata.xml index 4078e313a2d..c8cda2384e9 100644 --- a/www-apps/redmine/metadata.xml +++ b/www-apps/redmine/metadata.xml @@ -1,9 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<longdescription lang="en"> -</longdescription> +<maintainer type="person"> + <email>azamat.hacki...@gmail.com</email> + <name>Azamat H. Hackimov</name> +</maintainer> +<maintainer type="project"> + <email>proxy-ma...@gentoo.org</email> + <name>Proxy Maintainers</name> +</maintainer> <use> + <flag name="markdown">Enable support for Markdown</flag> <flag name="passenger">Enable support for <pkg>www-apache/passenger</pkg></flag> </use> </pkgmetadata> diff --git a/www-apps/redmine/redmine-3.2.1.ebuild b/www-apps/redmine/redmine-3.2.7.ebuild similarity index 95% copy from www-apps/redmine/redmine-3.2.1.ebuild copy to www-apps/redmine/redmine-3.2.7.ebuild index 7898ebdee45..16762dbd377 100644 --- a/www-apps/redmine/redmine-3.2.1.ebuild +++ b/www-apps/redmine/redmine-3.2.7.ebuild @@ -28,7 +28,7 @@ ruby_add_rdepend " =dev-ruby/request_store-1.0.5 >=dev-ruby/rbpdf-1.19.0 dev-ruby/actionpack-action_caching - dev-ruby/actionpack-xml_parser + dev-ruby/actionpack-xml_parser:* dev-ruby/protected_attributes >=dev-ruby/redcarpet-3.3.2 >=dev-ruby/nokogiri-1.6.7.2 @@ -90,10 +90,11 @@ all_ruby_install() { rm README.rdoc || die keepdir /var/log/${PN} - dosym /var/log/${PN}/ "${REDMINE_DIR}/log" insinto "${REDMINE_DIR}" doins -r . + insinto "${REDMINE_DIR}/config" + doins "${FILESDIR}/additional_environment.rb" keepdir "${REDMINE_DIR}/files" keepdir "${REDMINE_DIR}/public/plugin_assets" @@ -117,10 +118,14 @@ all_ruby_install() { has_apache insinto "${APACHE_VHOSTS_CONFDIR}" doins "${FILESDIR}/10_redmine_vhost.conf" - else - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}-2.initd" ${PN} 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}" } diff --git a/www-apps/redmine/redmine-3.2.1.ebuild b/www-apps/redmine/redmine-3.3.4.ebuild similarity index 63% copy from www-apps/redmine/redmine-3.2.1.ebuild copy to www-apps/redmine/redmine-3.3.4.ebuild index 7898ebdee45..f7d3f40472f 100644 --- a/www-apps/redmine/redmine-3.2.1.ebuild +++ b/www-apps/redmine/redmine-3.3.4.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -USE_RUBY="ruby21 ruby22" +EAPI=6 +# ruby23 don't have required deps +USE_RUBY="ruby22" inherit eutils depend.apache ruby-ng user DESCRIPTION="Flexible project management web application using the Ruby on Rails framework" @@ -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/actionpack-action_caching + dev-ruby/actionpack-xml_parser:* + >=dev-ruby/builder-3.2.2:3.2 >=dev-ruby/coderay-1.1.0 - >=dev-ruby/builder-3.0.4:* - >=dev-ruby/roadie-rails-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/request_store-1.0.5 - >=dev-ruby/rbpdf-1.19.0 - dev-ruby/actionpack-action_caching - dev-ruby/actionpack-xml_parser + 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}" @@ -61,39 +61,32 @@ pkg_setup() { } all_ruby_prepare() { - rm -r log files/delete.me || die + rm -r log files/delete.me Gemfile || die # bug #406605 - rm .gitignore .hgignore || die - - rm Gemfile || die + 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}/${P}_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} - dosym /var/log/${PN}/ "${REDMINE_DIR}/log" insinto "${REDMINE_DIR}" doins -r . + insinto "${REDMINE_DIR}/config" + doins "${FILESDIR}/additional_environment.rb" keepdir "${REDMINE_DIR}/files" keepdir "${REDMINE_DIR}/public/plugin_assets" @@ -117,16 +110,22 @@ all_ruby_install() { has_apache insinto "${APACHE_VHOSTS_CONFDIR}" doins "${FILESDIR}/10_redmine_vhost.conf" - else - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}-2.initd" ${PN} 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() { einfo - 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}\"" @@ -136,7 +135,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" @@ -149,38 +148,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." @@ -199,11 +209,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.2.1.ebuild b/www-apps/redmine/redmine-3.4.0.ebuild similarity index 63% rename from www-apps/redmine/redmine-3.2.1.ebuild rename to www-apps/redmine/redmine-3.4.0.ebuild index 7898ebdee45..5dc1aaf44f4 100644 --- a/www-apps/redmine/redmine-3.2.1.ebuild +++ b/www-apps/redmine/redmine-3.4.0.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -USE_RUBY="ruby21 ruby22" +EAPI=6 +# ruby23 and ruby24 dion't have required deps +USE_RUBY="ruby22" inherit eutils depend.apache ruby-ng user DESCRIPTION="Flexible project management web application using the Ruby on Rails framework" @@ -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/actionpack-action_caching + dev-ruby/actionpack-xml_parser:* + >=dev-ruby/builder-3.2.2:3.2 >=dev-ruby/coderay-1.1.0 - >=dev-ruby/builder-3.0.4:* - >=dev-ruby/roadie-rails-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/request_store-1.0.5 - >=dev-ruby/rbpdf-1.19.0 - dev-ruby/actionpack-action_caching - dev-ruby/actionpack-xml_parser + 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}" @@ -61,39 +61,32 @@ pkg_setup() { } all_ruby_prepare() { - rm -r log files/delete.me || die + rm -r log files/delete.me Gemfile || die # bug #406605 - rm .gitignore .hgignore || die - - rm Gemfile || die + 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.3.4_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} - dosym /var/log/${PN}/ "${REDMINE_DIR}/log" insinto "${REDMINE_DIR}" doins -r . + insinto "${REDMINE_DIR}/config" + doins "${FILESDIR}/additional_environment.rb" keepdir "${REDMINE_DIR}/files" keepdir "${REDMINE_DIR}/public/plugin_assets" @@ -117,16 +110,22 @@ all_ruby_install() { has_apache insinto "${APACHE_VHOSTS_CONFDIR}" doins "${FILESDIR}/10_redmine_vhost.conf" - else - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}-2.initd" ${PN} 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() { einfo - 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}\"" @@ -136,7 +135,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" @@ -149,38 +148,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." @@ -199,11 +209,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
