diff options
| -rw-r--r-- | www-apps/redmine/ChangeLog | 9 | ||||
| -rw-r--r-- | www-apps/redmine/files/redmine-1.4.1-bundler.patch | 15 | ||||
| -rw-r--r-- | www-apps/redmine/files/redmine-2.initd | 11 | ||||
| -rw-r--r-- | www-apps/redmine/files/redmine.initd | 49 | ||||
| -rw-r--r-- | www-apps/redmine/redmine-2.3.2.ebuild (renamed from www-apps/redmine/redmine-1.4.7.ebuild) | 82 |
5 files changed, 60 insertions, 106 deletions
diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog index 7fff54ee2238..5a109b173075 100644 --- a/www-apps/redmine/ChangeLog +++ b/www-apps/redmine/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-apps/redmine # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.37 2013/08/14 15:18:55 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.38 2013/09/02 14:13:43 pva Exp $ + +*redmine-2.3.2 (02 Sep 2013) + + 02 Sep 2013; Peter Volkov <pva@gentoo.org> + -files/redmine-1.4.1-bundler.patch, -redmine-1.4.7.ebuild, + +redmine-2.3.2.ebuild, files/redmine-2.initd, -files/redmine.initd: + Version bump, bug #463449, thank Coacher for report. Drop old. 14 Aug 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml: Fix e-mail address. diff --git a/www-apps/redmine/files/redmine-1.4.1-bundler.patch b/www-apps/redmine/files/redmine-1.4.1-bundler.patch deleted file mode 100644 index adef29a24226..000000000000 --- a/www-apps/redmine/files/redmine-1.4.1-bundler.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naurb redmine-1.4.1.orig/config/boot.rb redmine-1.4.1/config/boot.rb ---- redmine-1.4.1.orig/config/boot.rb 2012-04-20 19:01:56.000000000 +0900 -+++ redmine-1.4.1/config/boot.rb 2012-04-25 13:00:01.702911764 +0900 -@@ -41,11 +41,6 @@ - class Boot - def run - load_initializer -- Rails::Initializer.class_eval do -- def load_gems -- @bundler_loaded ||= Bundler.require :default, Rails.env -- end -- end - Rails::Initializer.run(:set_load_path) - end - end diff --git a/www-apps/redmine/files/redmine-2.initd b/www-apps/redmine/files/redmine-2.initd index f4fcdb20512a..e377788b2ccc 100644 --- a/www-apps/redmine/files/redmine-2.initd +++ b/www-apps/redmine/files/redmine-2.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.3 2013/05/13 10:32:29 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.4 2013/09/02 14:13:44 pva Exp $ RAILS_ENV=${RAILS_ENV:-production} REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine} @@ -9,7 +9,7 @@ REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost} REDMINE_PORT=${REDMINE_PORT:-3000} REDMINE_USER=${REDMINE_USER:-redmine} REDMINE_GROUP=${REDMINE_GROUP:-redmine} -REDMINE_PIDFILE="/run/redmine/server.pid" +REDMINE_PIDFILE="/var/run/redmine/server.pid" depend() { use apache2 git-daemon mysql net postgresql svnserve @@ -23,9 +23,8 @@ start_pre() { eerror return 1 fi - - if [ ! -d /run/redmine ]; then - checkpath -q -d -m 0755 -o redmine:redmine /run/redmine + if [ ! -d /var/run/redmine ]; then + checkpath -q -d -m 0755 -o redmine:redmine /var/run/redmine fi } @@ -37,7 +36,7 @@ start() { --exec /usr/bin/ruby "${REDMINE_DIR}"/script/rails server -- \ --daemon --environment=${RAILS_ENV} \ --binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \ - --pid "${REDMINE_PIDFILE}" \ + --pid="${REDMINE_PIDFILE}" \ ${REDMINE_OPTS} eend $? } diff --git a/www-apps/redmine/files/redmine.initd b/www-apps/redmine/files/redmine.initd deleted file mode 100644 index 49d59301492d..000000000000 --- a/www-apps/redmine/files/redmine.initd +++ /dev/null @@ -1,49 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine.initd,v 1.5 2013/05/13 10:32:29 pva Exp $ - -RAILS_ENV=${RAILS_ENV:-production} -REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine} -REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost} -REDMINE_PORT=${REDMINE_PORT:-3000} -REDMINE_USER=${REDMINE_USER:-redmine} -REDMINE_GROUP=${REDMINE_GROUP:-redmine} -REDMINE_PIDFILE="/run/redmine/server.pid" - -depend() { - use apache2 git-daemon mysql net postgresql svnserve -} - -start_pre() { - if [ ! -e "${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then - eerror "Execute the following command to initlize environment:" - eerror - eerror "# emerge --config www-apps/redmine" - eerror - return 1 - fi - - if [ ! -d /run/redmine ]; then - checkpath -q -d -m 0755 -o redmine:redmine /run/redmine - fi -} - -start() { - ebegin "Starting redmine" - cd "${REDMINE_DIR}" - start-stop-daemon --start --quiet --user ${REDMINE_USER}:${REDMINE_GROUP} \ - --pidfile "${REDMINE_PIDFILE}" \ - --exec /usr/bin/ruby "${REDMINE_DIR}"/script/server -- \ - --daemon --environment=${RAILS_ENV} \ - --binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \ - ${REDMINE_OPTS} - eend $? -} - -stop() { - ebegin "Stopping redmine" - cd "${REDMINE_DIR}" - start-stop-daemon --signal INT --quiet --pidfile "${REDMINE_PIDFILE}" - eend $? -} diff --git a/www-apps/redmine/redmine-1.4.7.ebuild b/www-apps/redmine/redmine-2.3.2.ebuild index 2995fcf50dd3..b2fda1992dcf 100644 --- a/www-apps/redmine/redmine-1.4.7.ebuild +++ b/www-apps/redmine/redmine-2.3.2.ebuild @@ -1,11 +1,9 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.4.7.ebuild,v 1.1 2013/05/11 21:29:22 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-2.3.2.ebuild,v 1.1 2013/09/02 14:13:43 pva Exp $ EAPI="4" -# rails:2.3 isn't available for ruby19 on Gentoo -#USE_RUBY="ruby18 ruby19" -USE_RUBY="ruby18" +USE_RUBY="ruby18 ruby19" inherit eutils depend.apache ruby-ng DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework" @@ -21,22 +19,27 @@ SLOT="0" IUSE="ldap openid imagemagick fastcgi passenger" #RDEPEND="$(ruby_implementation_depend jruby '>=' -1.6.7)[ssl]" +RDEPEND=" + ruby_targets_ruby18? ( + >=dev-ruby/fastercsv-1.5[ruby_targets_ruby18] + )" ruby_add_rdepend "virtual/ruby-ssl virtual/rubygems - >=dev-ruby/rails-2.3.15:2.3 - dev-ruby/i18n:0.4 - >=dev-ruby/coderay-1.0.6 - >=dev-ruby/tzinfo-0.3.31 + >=dev-ruby/rails-3.2.13:3.2 + >=dev-ruby/jquery-rails-2.0.2 + dev-ruby/i18n:0.6 + >=dev-ruby/coderay-1.0.9 + dev-ruby/builder:3 dev-ruby/rake ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 ) - openid? ( >=dev-ruby/ruby-openid-2.1.4 ) + openid? ( + >=dev-ruby/ruby-openid-2.1.4 + >=dev-ruby/rack-openid-0.2.1 + ) imagemagick? ( >=dev-ruby/rmagick-2 ) fastcgi? ( dev-ruby/fcgi ) - passenger? ( www-apache/passenger ) - ruby_targets_ruby18? ( - >=dev-ruby/fastercsv-1.5 - )" + passenger? ( www-apache/passenger )" # ruby_targets_ruby18? ( # >=dev-ruby/fastercsv-1.5 # postgres? ( >=dev-ruby/pg-0.11 ) @@ -46,7 +49,7 @@ ruby_add_rdepend "virtual/ruby-ssl # ruby_targets_ruby19? ( # postgres? ( >=dev-ruby/pg-0.11 ) # sqlite3? ( dev-ruby/sqlite3 ) -# mysql? ( dev-ruby/mysql2:0.2 ) +# mysql? ( dev-ruby/mysql2:0.3 ) # ) # ruby_targets_jruby? ( # dev-ruby/jruby-openssl @@ -57,18 +60,12 @@ ruby_add_rdepend "virtual/ruby-ssl # ) #ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2 +# dev-ruby/yard # test? ( -# !ruby_targets_ruby19? ( -# >=dev-ruby/shoulda-2.11 -# ) -# ruby_targets_ruby19? ( -# dev-ruby/test-unit -# ) -# ruby_targets_jruby? ( -# dev-ruby/test-unit -# ) -# >=dev-ruby/edavis10-object_daddy -# =dev-ruby/mocha-0.12* +# >=dev-ruby/shoulda-3.3.2 +# >=dev-ruby/mocha-0.13.3 +# >=dev-ruby/capybara-2.0.0 +# <dev-ruby/nokogiri-1.6.0 # )" REDMINE_DIR="/var/lib/${PN}" @@ -85,10 +82,14 @@ all_ruby_prepare() { rm .gitignore .hgignore || die rm Gemfile config/preinitializer.rb || die - epatch "${FILESDIR}/${PN}-1.4.1-bundler.patch" echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}" echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}" + + # remove openid module in case openid is disabled + use openid || rm -r lib/plugins/open_id_authentication || die + # remove ldap staff module to avoid #413779 + use ldap || rm app/models/auth_source_ldap.rb || die } all_ruby_install() { @@ -121,20 +122,20 @@ all_ruby_install() { "${REDMINE_DIR}/tmp" \ /var/log/${PN} - if use passenger ; then + if use passenger; then has_apache insinto "${APACHE_VHOSTS_CONFDIR}" doins "${FILESDIR}/10_redmine_vhost.conf" else newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd" ${PN} + newinitd "${FILESDIR}/${PN}-2.initd" ${PN} fi doenvd "${T}/50${PN}" } pkg_postinst() { einfo - if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then + if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then elog "Execute the following command to upgrade environment:" elog elog "# emerge --config \"=${CATEGORY}/${PF}\"" @@ -157,17 +158,29 @@ pkg_postinst() { } pkg_config() { - if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ] ; then + if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml" eerror "then edit this file in order to configure your database settings for \"production\" environment." die fi local RAILS_ENV=${RAILS_ENV:-production} - local RUBY=${RUBY:-ruby18} + if [ ! -L /usr/bin/ruby ]; then + eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation." + eerror "Please update it via `eselect ruby`" + die + fi + local RUBY=${RUBY:-ruby} cd "${EPREFIX}${REDMINE_DIR}" || die - if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then + if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then + einfo + einfo "Generating secret token." + einfo + rm config/initializers/session_store.rb || die + RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die + fi + if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then einfo einfo "Upgrading database." einfo @@ -175,8 +188,7 @@ pkg_config() { einfo "Migrating database." RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die einfo "Upgrading the plugin migrations." - RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate:upgrade_plugin_migrations # || die - RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate_plugins || die + RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die einfo "Clear the cache and the existing sessions." ${RUBY} -S rake tmp:cache:clear || die ${RUBY} -S rake tmp:sessions:clear || die @@ -186,7 +198,7 @@ pkg_config() { einfo einfo "Generating a session store secret." - ${RUBY} -S rake generate_session_store || die + ${RUBY} -S rake generate_secret_token || die einfo "Creating the database structure." RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die einfo "Populating database with default configuration dat." |