Version bump. Fixed bad log file permissions problem reported by Jan Matějka in bug #480980.

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

3 files changed, 227 insertions, 15 deletions

diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog
index a1f804802b31..bd6eceb3f463 100644
--- a/www-apps/redmine/ChangeLog
+++ b/www-apps/redmine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/redmine
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.39 2014/01/08 06:12:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.40 2014/01/10 12:20:19 pva Exp $
+
+*redmine-2.3.4 (10 Jan 2014)
+
+  10 Jan 2014; Peter Volkov <pva@gentoo.org> +redmine-2.3.4.ebuild:
+  Version bump. Fixed bad log file permissions problem reported by Jan Matějka
+  in bug #480980.
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> redmine-2.2.4.ebuild,
   redmine-2.3.2.ebuild:
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 641d1c404fc9..9e46a3360ae2 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -6,24 +6,16 @@ AUX redmine-2.initd 1458 SHA256 fb8f37ea5b7bd3a42f2c5a7d1259776696cdc3238fb11b4a
 AUX redmine.confd 267 SHA256 2ac6b7dfc2d055554b7ee9380fcf1a49a708bbd866987b775507d7a3b30f2d41 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94 WHIRLPOOL fd6e8c63921d7ab2d73b5b15ff91db64ead03e521325871e21a1d165e313a1e56c607e9d9553504ccdef10a917a85ecdd5502527df159012b471803f4063ea00
 DIST redmine-2.2.4.tar.gz 3754826 SHA256 8465eb42865f7b5972a27fd66f08678244a77f7fc495ccb99978fbdbf8968d7f SHA512 d6ed394de71db1b98d22f47e105b698c798d84887161977d264f1629e8d5e917a0f24fd633378c855243609d9b318d81a81dc4d703198f043a24f01fcbdd6024 WHIRLPOOL fcd3c79dfab006f2eade4d9ae3d6d987731a7e21a7c51727fb184291e98364f6be7b96452ebd33419565069a2cc757d5f2b606ba8c2dcca3d4b685067b333f1b
 DIST redmine-2.3.2.tar.gz 3801029 SHA256 dc3f86f2ac591c6d0886d183b68604aa80fc90d412bdeab0c3a57c9cd7b43384 SHA512 e7dbf520762db204f8aca8940b429ca004e96f7f5175dcc261e2d96e2d730714189bce3dce91374cd360968250239680894872af459986e97ed76700e496d699 WHIRLPOOL fa3d802cdbebacb84dd91af105a34c40dfeef1f4232b5780cd8ef7a8a0adbed817a96e63ae62415c526e73ff4b5132b698eaad530a91213bdd1fd572c20df76b
+DIST redmine-2.3.4.tar.gz 3810010 SHA256 0b435f4b121baf4cea9f66dbf9558c9e3a8a3239f99ef1e46c9044b4d9d327c6 SHA512 763aff728ac3f9a796198be3ba0ab745c8ad10340560d271f8d9a2a0ead83d85af54a5ba67763457a7d44844ae9d7f2640e296d70cc48c9b74cfb7e28d75a11a WHIRLPOOL bb8d06cdd2db533e18b5d37537c199a6792cead85769c4a714bcfbcf524a56cf976439929ed2fa9337e3c3654faab645564814de92eaf245db06b9aa69812b40
 EBUILD redmine-2.2.4.ebuild 6617 SHA256 b133c88c559c655179b10ea3f204915e639c94b7375cd1e3f39929ef1969f114 SHA512 982e3c73928bae798e2a5174dcb890bca1a1456582978dcf46a63886a71687628a9a484d5442891d902b8f561823eb03c724006958482ff2ba51c4f26e714f01 WHIRLPOOL 315672d9caf985514db0f6dbdd6a6a08a6af014355db4ab447b0924c2d2918ab0eac8b0f08402966d046b2ad6a162f59eae22b409ea925ee828935707ce36f07
 EBUILD redmine-2.3.2.ebuild 6546 SHA256 4d96c012a3a1aa910e26ef921fb514142d640455734a08313b3e504fa55d71c2 SHA512 5169aea63a202d32e9a7d6fd4c03f15d325a8261908424cdc5312d40eed0a5df054f2213c20abfc5d090823c8a11bed984214008f8df8dbc8420f77eeca26cd2 WHIRLPOOL 76ece1cda32ac8dba9fb52913a309054cbf0eed5b18404d191395ce006f2f9b985bb452b70185967cfdfde34196d4bcafe42d2e540e9a2ee0b3181e54f3fa5ac
-MISC ChangeLog 8051 SHA256 a9726a1e68ec2daecfd9356b0185f1a50656eb081c921c7978daeb6934375c98 SHA512 dff63902a8d1afe4b32237d9d3d94e397698ed3db21ee655864ef059115d1493380016f894353c11e82116229c511cec0efb3f98c387a686538aa88ff4921407 WHIRLPOOL 6ad8911c9d4eb93499c40abf8461f3c95730f8c97106e2963dacb352ebdd8fc1dcd8ee6d32f7b19abaa2134ee1b4a1c6c0e63dba1de99cc1d23b8afe5d1ce802
+EBUILD redmine-2.3.4.ebuild 6614 SHA256 5711f18fea292a178a3c8f7f2444ae70b185a11151aabda367a6d5a07df749ee SHA512 cf977bcc29f8609466f97e06dcc9f0d5f6ff10e760a5d044314641217e2953aa2f6524eae92060256327c57f42e983a98a207a953229418a8a1d339937c2a91a WHIRLPOOL 994163fe3d7fb0b8ea3c3313e57cd1919a0eeef6c768a96ec16d1966b7ff978d972b250c9cfc761fdc1cb739b14ac2fc5b352a5bab25f8befe5f1f8422a05456
+MISC ChangeLog 8245 SHA256 e7fc245e919f1cd595dc5b0d024edc3ede9935c80410531f81fff229bec9c94b SHA512 74803c04e35461d01b6d43b25fff2be9acec849517e8b910d654006fecd1afb443e5ea236bc87411f7b9f1c136b3342fe9e81a7560b5b5c6c454c74528e769f4 WHIRLPOOL 56884bf84614f738b140b255514b6dea270e8017fd34228b949235791315050ccbabf29bd300f947c625b9f8a90a928ec9a19bfcc68ee68f6f664817a7fb6bf9
 MISC metadata.xml 570 SHA256 94132e91206887cc26b518bc8887152ff4db8cf967e5fb866c3c802955395fd3 SHA512 d253e0a41ca27766caf87192271afcdd847f9930094d77739dec72e79acc880de6e6998b6bb13367546164c2907b81cfac22d409a59f58c18f2b6f163f64e7a9 WHIRLPOOL 3e2e867032311fc61864394a2bb921735167de99a8781afe5c0f1bf36954c5325eeb45d799264717a067f1d6456ed571d8ca47511e5c5e7f43eeed989ad3ff66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzOxtAAoJEPGu1DbS6WIAj1sP/jt8V19v0Y3Ehq5VnB1LfZzU
-sTcFRcPEftO5UhUBgMJ8SFbtJSl6geBh5qo5Cd+5gvFdk/IElchfGSda6enyX+iB
-GqsJVATsXjamdo0s7PZvukeyARltZuaSuY8X7/SsgdnizDjeNJLlAcLL9OtfsMCK
-nQb4j+wc5U4eglOkoFO8sThFmzx+bX1hmR+C21SZ5N7586duJPD3kGftNmUSWd0g
-B8y8ihWZY6oxtR/kIvjlOZr5i0hTJficAsSWBqQlz3dnjB2LCjEPzNw5ge2DVcgD
-MfPr+qAhgaycxiEL6QXgTqfxoHtIiUn8YJBz+6g/oIIdk3z43jkCm+UwWy3yNnBx
-9koxEiPolrMD9JATlhDSghHjgRnLrXJveJIzsSx/ZoR68eB2xux4O80fqT6wppjE
-NsP+yokrgpzn6NooesaYRhnPy9wBXp7edlsS9bzq4YiHaVF3llqYxKVpmGFpkXAX
-URx0/hadG9ulezvkiCmWiv14bRMzkEpP2Pw5FQYHWcQB35zpssQfFHrIGL3sFZCu
-02V0jkM7V4/+g+5lS/4Sr08HyLhCg1S27fsFXv0CpxU701wOa8AGhbF6VgmQ2/wC
-Hz2qus4ziqK50z/onSNxO2RETAMVVfdceDYunvYMsQeiavPDShKOssitVNzP2a27
-a1jZMtT6Ljaw5npbegBz
-=jneL
+iF4EAREIAAYFAlLP5cYACgkQGrk+8vGYmwd3owD+LC6hhc9l0QLDYxa0fyL4p2gQ
+VIDjl7CbFtTeEpEq27UA/jhbezyAH965W5+LjFXGHS8DlwMYr8dSYxN2qejQPD6R
+=JbAU
 -----END PGP SIGNATURE-----
diff --git a/www-apps/redmine/redmine-2.3.4.ebuild b/www-apps/redmine/redmine-2.3.4.ebuild
new file mode 100644
index 000000000000..c943af36610b
--- /dev/null
+++ b/www-apps/redmine/redmine-2.3.4.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-2.3.4.ebuild,v 1.1 2014/01/10 12:20:20 pva Exp $
+
+EAPI="4"
+USE_RUBY="ruby18 ruby19"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+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="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-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
+		>=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
+#		postgres? ( >=dev-ruby/pg-0.11 )
+#		sqlite3? ( dev-ruby/sqlite3 )
+#		mysql? ( >=dev-ruby/mysql-ruby-2.8.1 )
+#	)
+#	ruby_targets_ruby19? (
+#		postgres? ( >=dev-ruby/pg-0.11 )
+#		sqlite3? ( dev-ruby/sqlite3 )
+#		mysql? ( dev-ruby/mysql2:0.3 )
+#	)
+#	ruby_targets_jruby? (
+#		dev-ruby/jruby-openssl
+#		>=dev-ruby/fastercsv-1.5
+#		mysql? ( dev-ruby/activerecord-jdbcmysql-adapter )
+#		postgres? ( dev-ruby/activerecord-jdbcpostgresql-adapter )
+#		sqlite3? ( dev-ruby/activerecord-jdbcsqlite3-adapter )
+#	)
+
+#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}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me || die
+
+	# bug #406605
+	rm .gitignore .hgignore || die
+
+	rm Gemfile config/preinitializer.rb || 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}"
+
+	# 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() {
+	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
+	rm -fr doc || die
+	dodoc README.rdoc
+	rm README.rdoc || die
+
+	keepdir /var/log/${PN}
+	dosym /var/log/${PN}/ "${REDMINE_DIR}/log"
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	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"
+	else
+		newconfd "${FILESDIR}/${PN}.confd" ${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" -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}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initlize environment:"
+		elog
+		elog "# cd ${EPREFIX}${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
+	einfo
+}
+
+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."
+		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
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EPREFIX}${REDMINE_DIR}" || die
+	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
+
+		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 "${EPREFIX}${REDMINE_DIR}"/log/production.log
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
+		einfo
+		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}