Added moinmoin-1.7.1 wrt sec issue #233560.

Package-Manager: portage-2.1.4.4

4 files changed, 73 insertions, 23 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/Manifest b/www-apps/moinmoin/Manifest
index 393f6e0c07b1..607526bc3d65 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 808 RMD160 3588cba97e7bd235f140da8bd919f52af26d85e1 SHA1 ca94a45143e3f9be652559580d258cb822dc52af SHA256 43e2ee06036c7582e5b0ad40ffd1b9afd96e6abb90a0e4208c6e53eae243571a
 AUX reconfig-2 421 RMD160 5589dd4a8a87158bf88a99eda91695c7f938599c SHA1 b7d1df9ae27a6fa7ab3b55c53e4f8f382bb47775 SHA256 e885eb6c78df793fe2954a35631f3b611429412e78761bde00587cc14df26657
-DIST moin-1.6.1.tar.gz 5124404 RMD160 7a10dc035f88eaeaa456f45238209fcf49aabc92 SHA1 086ca44b04540c5c4cd6e4eeec7a7a2cf30c32ad SHA256 1e65b3120cbfad5054e6199dfdbe1d72699088934b45b3a49933140050c9f483
+AUX reconfig-3 596 RMD160 8be97aa5ac68a26c6aec0d132bdfdea59837b233 SHA1 954e33cca005ae5a66cb6ece80bcac891454a331 SHA256 6f281643ef1b4744b488686815f6b5b5511ab8848497d9340594ad96c5ecbd44
 DIST moin-1.6.3.tar.gz 5199116 RMD160 fdd6d1b342114b7c7031d57a41a5a8de10e53e13 SHA1 aa1eaded46f0d8394b36a5388a7fdad3b931db19 SHA256 7be6d81b206fe929d10a058be51d7993598547c4ee33321028fd54b010ce80cc
-EBUILD moinmoin-1.6.1.ebuild 1751 RMD160 b2e0fac7a267f077af44e6de5b1f21c91b3258b9 SHA1 bd6a3ccfa67502131e4a884c2349093449aa809d SHA256 3793a254663566bed8024b9731ddc4ed67ac2adb28845a75c71e1d3002817e32
+DIST moin-1.7.1.tar.gz 5468224 RMD160 04e5393e9a2f88e635ec7ed94045062103b645fc SHA1 5a9a83cdbc8546b95e8bb2da65e1da3595328f7c SHA256 f2818bf700257c240962a4861b4cb1bc200ee51aa7390f90fdd345db8e8d79d7
 EBUILD moinmoin-1.6.3.ebuild 1781 RMD160 5835b59a5c5f13352afb719f14e821c397646f92 SHA1 745826d0108b882de227631cbe7261baf0c47dc1 SHA256 04bb57733c6e937b12a33fc516057b8d2531f6db5b123b8787412cb3f9a037ac
-MISC ChangeLog 8035 RMD160 41d310c7075e0efffe54eb50e9fc2e2acf386d15 SHA1 3aa19d6a9377b92c1cbab564237a5fc610801977 SHA256 566e130b640b8548aba371da17e1b192a886c6890c6f12d0e0933f9b0849504c
+EBUILD moinmoin-1.7.1.ebuild 1784 RMD160 d7dca0125d7907a9dab941fc1c37ec7e8e343634 SHA1 a4921faf562c319ed836d51575c8c2c2939aa58b SHA256 9891ca1283dbdca3503390d068fd9de3443d2da217cbb902e4caac6ff08b12fe
+MISC ChangeLog 8214 RMD160 10cf5de6ed06c8adc1703ddb8313afd517561e11 SHA1 fdb125bc09d4381d1d71fcbbe3a4547bc2f901a1 SHA256 0c97a55d031cd2f253d37be77bd02c28ffb2d35ab7e11b9b10ad280f417cc56e
 MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIk0WeEEcxCpcDQ74RAgWTAKCDaxCanWqi7lITIVXPsvjpm7iJAQCfYdsL
+9d5ryjLXVSH7vZmSNxZ/eTo=
+=GWCe
+-----END PGP SIGNATURE-----
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