Added moinmoin-1.7.1 wrt sec issue #233560.

(Portage version: 2.1.4.4)

3 files changed, 59 insertions, 20 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index 4b723937170b..6dc2dc170379 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/moinmoin
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.47 2008/04/28 18:11:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.48 2008/08/01 17:19:11 wrobel Exp $
+
+*moinmoin-1.7.1 (01 Aug 2008)
+
+  01 Aug 2008; wrobel@gentoo.org +files/reconfig-3, -moinmoin-1.6.1.ebuild,
+  +moinmoin-1.7.1.ebuild:
+  Added moinmoin-1.7.1 wrt sec issue #233560.
 
   28 Apr 2008; Raúl Porcel <armin76@gentoo.org> moinmoin-1.6.3.ebuild:
   sparc stable wrt security #218752
diff --git a/www-apps/moinmoin/files/reconfig-3 b/www-apps/moinmoin/files/reconfig-3
new file mode 100644
index 000000000000..c237fd0b5b07
--- /dev/null
+++ b/www-apps/moinmoin/files/reconfig-3
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	sed -e "s|^#\(.*\)/path/to/wikiconfigdir|\1${VHOST_ROOT}/${PN}-${PVR}|g" -i ${MY_INSTALLDIR}/moin.cgi || die "sed failed"
+	sed -e "s|\./data/|${VHOST_ROOT}/${PN}-${PVR}/data|
+			s|\./underlay/|${VHOST_ROOT}/${PN}-${PVR}/underlay|
+			s|moin_static171|${VHOST_APPDIR}|
+			s|#url_prefix_static|url_prefix_static|" -i ${VHOST_ROOT}/${PN}-${PVR}/wikiconfig.py || die "sed failed"
+	sed -e "s|//|/|" -i ${VHOST_ROOT}/${PN}-${PVR}/wikiconfig.py || die "sed failed"
+
+elif [ $1 = "clean" ]; then
+	echo $1
+fi
diff --git a/www-apps/moinmoin/moinmoin-1.6.1.ebuild b/www-apps/moinmoin/moinmoin-1.7.1.ebuild
index 6d13bde17e1e..762f281864d9 100644
--- a/www-apps/moinmoin/moinmoin-1.6.1.ebuild
+++ b/www-apps/moinmoin/moinmoin-1.7.1.ebuild
@@ -1,61 +1,74 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.6.1.ebuild,v 1.5 2008/02/25 15:11:57 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.7.1.ebuild,v 1.1 2008/08/01 17:19:11 wrobel Exp $
 
 MY_PN="moin"
 PYTHON_MODNAME="MoinMoin"
+
 inherit webapp distutils
 
+WEBAPP_MANUAL_SLOT="yes"
+
 DESCRIPTION="Python WikiClone"
 SRC_URI="http://static.moinmo.in/files/${MY_PN}-${PV}.tar.gz"
 HOMEPAGE="http://moinmo.in/"
 
-KEYWORDS="amd64 ppc sparc x86"
 LICENSE="GPL-2"
-IUSE="rss"
 SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="rss"
 
 DEPEND=">=dev-lang/python-2.3"
 RDEPEND="${DEPEND}
-	virtual/httpd-cgi
 	>=dev-python/docutils-0.4
 	rss? ( >=dev-python/pyxml-0.8.4 )"
-S=${WORKDIR}/${MY_PN}-${PV}
 
-src_install () {
-	webapp_src_preinst
+need_httpd_cgi
 
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+src_install() {
+	webapp_src_preinst
 	distutils_src_install
 
 	dodoc README docs/CHANGES* docs/HACKS docs/README.migration
 	dohtml docs/INSTALL.html
-	dodir "${MY_HOSTROOTDIR}/${PF}"
+	rm -rf README docs/
+
+	cd "${D}"/usr/share/moin
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/* server/moin.cgi
+	fperms +x "${MY_HTDOCSDIR}/moin.cgi"
+
+	insinto "${MY_HOSTROOTDIR}"/${PF}
+	doins -r data underlay config/wikiconfig.py
+
+	insinto "${MY_HOSTROOTDIR}"/${PF}/altconfigs
+	doins -r config
 
-	cd "${D}/usr/share/moin"
-	cp -r htdocs/* server/moin.cgi "${D}/${MY_HTDOCSDIR}"
-	chmod +x "${D}/${MY_HTDOCSDIR}/moin.cgi"
-	cp -r data underlay config/wikiconfig.py "${D}/${MY_HOSTROOTDIR}/${PF}"
-	cp -r config "${D}/${MY_HOSTROOTDIR}/${PF}/altconfigs"
-	cp -r server "${D}/${MY_HOSTROOTDIR}/${PF}/altserver"
+	insinto "${MY_HOSTROOTDIR}"/${PF}/altserver
+	doins -r server
 
 	# data needs to be serverowned per moin devs
-	cd "${D}/${MY_HOSTROOTDIR}/${PF}"
+	cd "${D}/${MY_HOSTROOTDIR}"/${PF}
 	for file in $(find data underlay); do
 		webapp_serverowned "${MY_HOSTROOTDIR}/${PF}/${file}"
 	done
 
-	webapp_configfile "${MY_HOSTROOTDIR}/${PF}/wikiconfig.py"
-	webapp_hook_script "${FILESDIR}/reconfig-2"
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_configfile "${MY_HOSTROOTDIR}"/${PF}/wikiconfig.py
+	webapp_hook_script "${FILESDIR}"/reconfig-3
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 
 	webapp_src_install
 }
 
 pkg_postinst() {
+	ewarn
 	ewarn "If you are upgrading from 1.3.x, please read"
 	ewarn "README.migration in /usr/share/doc/${PF}"
 	ewarn "and http://moinmoin.wikiwikiweb.de/HelpOnUpdating"
+	ewarn
 
 	distutils_pkg_postinst
 	webapp_pkg_postinst