Version bumped. Fixed directory owners and permissions, bug #406605.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 216 insertions, 18 deletions

diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog
index adaa125227b2..3cd5a42162fe 100644
--- a/www-apps/redmine/ChangeLog
+++ b/www-apps/redmine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/redmine
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.28 2012/02/26 13:58:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.29 2012/03/12 16:41:05 matsuu Exp $
+
+*redmine-1.3.2 (12 Mar 2012)
+
+  12 Mar 2012; MATSUU Takuto <matsuu@gentoo.org> +redmine-1.3.2.ebuild,
+  files/redmine.initd:
+  Version bumped. Fixed directory owners and permissions, bug #406605.
 
 *redmine-1.3.1 (26 Feb 2012)
 
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index bc53cce5273b..637e97df55c9 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -4,27 +4,29 @@ Hash: SHA1
 AUX 10_redmine_vhost.conf 343 RMD160 b4d6188a7579162b5d3ce891cab3ed1b7a1fc2f8 SHA1 e176c667402308b8475bec75890cca3a22d99a42 SHA256 4067d312a5fc8e7f1f98e8917d2e9c296a70a7e9847efaf92a8415d753387435
 AUX redmine-rubytree-r8214.patch 8082 RMD160 7b80533d66c61fac4f8261e5dbafdcf9af2cec17 SHA1 1987f421d323f909f3f3b9c5bb4b2c3457900c16 SHA256 4fea78ac11b90a44d94bca2f424c0c180ae9d9beb19212b8a88cf157408a5812
 AUX redmine.confd 267 RMD160 03b2a3d9d4e156bc0a6bd6969a3ae8800c9a51d9 SHA1 9402fd36df731413ce130e7e63411729de391444 SHA256 2ac6b7dfc2d055554b7ee9380fcf1a49a708bbd866987b775507d7a3b30f2d41
-AUX redmine.initd 1092 RMD160 bf656e18a7c03f096459dd66ba149dbcf632b9b3 SHA1 c4aa4daf30a286b665d821da123bb0117c7dd202 SHA256 c89d411280db50c9f57867ec79e1c13c73d241e5e6f7a833b1b84d94d1029595
+AUX redmine.initd 1328 RMD160 5d5ca5fdcb85b95554ecfb8f907c8bc428f5eebf SHA1 5277fbd4119f49764e8aa6fc6c04b36dc75c2ad9 SHA256 18ede107d4aaa4712515e9d70910e48ce508954c682cccd29d8936fee527249a
 DIST redmine-1.3.0.tar.gz 6018236 RMD160 288f699629cfdd1b5fa281b1efcc78e7b68da4c8 SHA1 51ad635083f27de7d1e243471d229b30f4ae7292 SHA256 f09027513c85440adbc2513bc13a454ca872a87c77b8a9be9256f1fc6c1b3e52
 DIST redmine-1.3.1.tar.gz 6034718 RMD160 3a74bd620f9ac787f9e76c7e37417df446aea20f SHA1 7e500ab907dcada419584b5c101fbf2e507a6cb0 SHA256 144e4762169240eb35b7945cde1e9d96d1e0e2b002b2585d568f77653d4ab81d
+DIST redmine-1.3.2.tar.gz 6001754 RMD160 7bc93d0e44a07c942226c14d552e47e394a74f0b SHA1 1ae35e42a5d6f3e82b95e2f299d185e5a543b56e SHA256 35c8300c875e3c8461b5c21fe026ef3820dfd182b3cd467895c84eb147feabfc
 EBUILD redmine-1.3.0.ebuild 5067 RMD160 b06eb586acfd3a1c4b6d8bf0aaec3837349ed2df SHA1 edfe10f56bad832819a1c8419610977c23c00eac SHA256 9a6ecf6305d2b6fade10a48ccfad08b4375af352939565247778b9d1ef3eabf5
 EBUILD redmine-1.3.1.ebuild 5514 RMD160 ed5c473ea434ffef8a5f6a039c649530f71f7ffd SHA1 203f4d6022b9bde457624cf4e2775ec903fc9a42 SHA256 09ca156467d414c8841decaf857b3eef663876e49ba8e9da5e54b499c457791b
-MISC ChangeLog 5354 RMD160 50273bdf81f6cf0d7f2c4f369c91dfb6b9b22029 SHA1 35705591499c39ed8b84e6c4e9a93449b529bf07 SHA256 1c15826abc0e7f23bef37c1afe7fb5d88f32bfcef1db7673f8eae924c4a737c3
+EBUILD redmine-1.3.2.ebuild 5735 RMD160 80d1deeb0d1955c6808200d370cce174bc8d0f4e SHA1 463933344b7ea40fc77835b8ac6edf90c77e21bd SHA256 91a9a8d2f8725b2aaeb777f969f23ebdb343ccf9da3b7f2e3efff4655ff2b23c
+MISC ChangeLog 5551 RMD160 fc26a31c9036bbb3483b6ab27031b92c439b2089 SHA1 c226dc27dd31b34856271d94407aca31ada3ef82 SHA256 f61d48bc81d30a01288dcc47dc90ce8da9d945b61b6f2888ad29ee199443528f
 MISC metadata.xml 398 RMD160 735855f2c2c3938b5836087fd524fdef8feca7da SHA1 fdb1314393eb313bbdad99ed6824f998bc53bc00 SHA256 492fedc9e0ee6f7d2aad26b056be8d4f726159417554a5132c5bc3b91ddb68f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPSjqCAAoJECaGw+YFKA1pRKcP/2W1D35/GXNH3FHunqj5V1vL
-hHALziiK8WsAZvC73vwGVUP0T0kiS4y792Bzz179fM1qqbqh5Y+eNUXoGvyHJIiP
-qeBW8gacV1hnbQ7jkDl043VvI3+TJUOLbwKonyNg2GrF9u1j2IWu44kSug8ga3/s
-kb3bG64Kshri5LBr7HD9R9aCXq4tXgEAjsCGjBGpvQrGkvnUHy4h22rqKaTURo6o
-lDoqKeTb/n7ElRdr+ECNWe7/UAaDfIdu1AYLqLfOykrnlXgCBVGsQt2w2mWfMbZv
-g98oG0AUT7np4RbvSzQuhQl10TErJfE7o3A6jIHao8+Damoim6nCa1nfr8225SWg
-fwXLqXZj0WL6AZ68UX5cx+EvE73Hc6COuQApWhL6aRRqshHxbE5NGjbe9n7A1I76
-f+dAHgkD0OrJ8r7HRM6qlIYJp1VF0ACpBoMAXJ1kH8fmiInBB4cr7xHUlaMzJSzy
-A70+d2W16zZoCqjg/0Bfmk71qelB7YNaLxzjqEo9K9NbpkGZOmDosSamBWzvwRlH
-0cYqb/cwyQOPUWMxwaFYndgk/skVTLtKsY+SD9FnF+GK7e2IZZFGcKqQorS5RU3d
-2Bm64Q1sBF2Tx5DM9KIKyZo0Oq7AwhGVWU8eik30p0zC63wWTH5RxxgJCKwwRrBo
-WTLJXNsCxrpC70QSBAJa
-=ZTyh
+iQIcBAEBAgAGBQJPXicqAAoJECaGw+YFKA1pqkEP/jXSibd6p6dSWw0G98Tj+OP+
+ZwnZ3x98T9QHQI4fdtIZtkNQ740Qut+CNDRlBDx1e23CpAxET9XzPQrPd81W39Ce
+R6WuOl0KYfUIXNWpdkvgKZcFqxgUwYSdBZMi19icC6Iw1PxF4ATpDpITFNuz5lLK
+IshFg83+3W1wCn9YnzwFmFHd4sa+07/KWqRvCC9taPKwSDQvJ1blIelW1OGA6+dy
+4XEuMALSMYkItoRn34OKyY6s4vGwkKQSZNqCQbFijOI5PpsHSXCmKbanLwfqVSPF
+1oZQx5pxCQOImD+CaXO5ln4s0WzhilgvkQDZbP8bsrvvLQLWJ44xFkOvr8dHb6aI
+nwiiYQ8u6o4GyBGFZ7D/4O532RWGyOWbCaW5I+TrUmTXHdShx5+LYaWFw7u27G6V
+OWuCKpwMTDHc48sabbEcdMYLL8JYQ1ZXzBWjR0MvX84Dw7ggmVEMxoKaZcm+//DU
+GnzbAUlXiKwUZnAPKBrCYb+ioaBTU9evvUUrCt62ptA7nY+uO6iRizuH6pGjIEuh
+ID2Y2Ac6XuCJRkGtt1J2joSX41qepVANBymTBOgmeoYEFmNB0B/GoMIH8HRCsSRK
+K2fQ/ma1EJbrlUfPp9pBeMS32oPsAMBjhRxLU+HITIxCoWZHxmaYYw3YAW2cd5yM
+8og1ZdEw7flBl2NukhtW
+=9l2k
 -----END PGP SIGNATURE-----
diff --git a/www-apps/redmine/files/redmine.initd b/www-apps/redmine/files/redmine.initd
index b185aeaaf003..1368da6ade50 100644
--- a/www-apps/redmine/files/redmine.initd
+++ b/www-apps/redmine/files/redmine.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.3 2011/09/29 00:40:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine.initd,v 1.4 2012/03/12 16:41:05 matsuu Exp $
 
 RAILS_ENV=${RAILS_ENV:-production}
 REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine}
@@ -15,6 +15,16 @@ 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
+}
+
 start() {
 	ebegin "Starting redmine"
 	cd "${REDMINE_DIR}"
diff --git a/www-apps/redmine/redmine-1.3.2.ebuild b/www-apps/redmine/redmine-1.3.2.ebuild
new file mode 100644
index 000000000000..0ac86d12e686
--- /dev/null
+++ b/www-apps/redmine/redmine-1.3.2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.3.2.ebuild,v 1.1 2012/03/12 16:41:05 matsuu Exp $
+
+EAPI="3"
+# ruby19: dev-ruby/rack has no ruby19
+# jruby: dev-ruby/rails has no jruby
+# rbx: dev-ruby/rails has no rbx
+#USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18"
+inherit eutils depend.apache ruby-ng
+
+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"
+#IUSE="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
+IUSE="fastcgi imagemagick openid passenger"
+
+RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
+
+ruby_add_rdepend "virtual/ruby-ssl
+	virtual/rubygems
+	>=dev-ruby/coderay-1
+	>=dev-ruby/ruby-net-ldap-0.0.4
+	~dev-ruby/i18n-0.4.2
+	>=dev-ruby/rack-1.1:0
+	dev-ruby/rake
+	>=dev-ruby/rails-2.3.14:2.3
+	dev-ruby/activerecord:2.3
+	fastcgi? ( dev-ruby/ruby-fcgi )
+	imagemagick? ( dev-ruby/rmagick )
+	openid? ( dev-ruby/ruby-openid )
+	passenger? ( www-apache/passenger )"
+
+#RDEPEND="${RDEPEND}
+#	bazaar ( dev-vcs/bazaar )
+#	cvs? ( >=dev-vcs/cvs-1.12 )
+#	darcs? ( dev-vcs/darcs )
+#	git? ( dev-vcs/git )
+#	mercurial? ( dev-vcs/mercurial )
+#	subversion? ( >=dev-vcs/subversion-1.3 )"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	# home directory is required for SCM.
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me || die
+	rm -r vendor/gems/coderay-1.0.0 || die
+	rm -r vendor/plugins/ruby-net-ldap-0.0.4 || die
+	rm -fr vendor/rails || die
+
+	# bug #406605
+	rm .gitignore .hgignore || die
+
+	# bug #399503
+	rm -r vendor/gems/rubytree-0.5.2 || die
+	epatch "${FILESDIR}/${PN}-rubytree-r8214.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}"
+	sed -i -e "/RAILS_GEM_VERSION/s/'.*'/'$(best_version dev-ruby/rails:2.3|cut -d- -f3)'/" config/environment.rb || die
+}
+
+all_ruby_install() {
+	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} || die
+	rm -fr doc || die
+	dodoc README.rdoc || die
+	rm README.rdoc || die
+
+	keepdir /var/log/${PN} || die
+	dosym /var/log/${PN}/ "${REDMINE_DIR}/log" || die
+
+	insinto "${REDMINE_DIR}"
+	doins -r . || die
+	keepdir "${REDMINE_DIR}/files" || die
+	keepdir "${REDMINE_DIR}/public/plugin_assets" || die
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN} || die
+	# for SCM
+	fowners redmine:redmine "${REDMINE_DIR}" || die
+	# bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN} || die
+
+	if use passenger ; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf" || die
+	else
+		newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
+		newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
+		keepdir /var/run/${PN} || die
+		fowners -R redmine:redmine /var/run/${PN} || die
+		dosym /var/run/${PN}/ "${REDMINE_DIR}/tmp/pids" || die
+	fi
+	doenvd "${T}/50${PN}" || die
+}
+
+pkg_postinst() {
+	einfo
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.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 "# 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 and 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}
+
+	cd "${EPREFIX}${REDMINE_DIR}"
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
+		einfo
+		einfo "Upgrade database."
+		einfo
+
+		einfo "Migrate database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrade 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
+		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 "Initialize database."
+		einfo
+
+		einfo "Generate a session store secret."
+		${RUBY} -S rake generate_session_store || die
+		einfo "Create the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Insert default configuration data in database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		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 db/ db/*.sqlite3"
+		einfo
+	fi
+}