Remove vulnerable version (sec issue #207757) and fix dependencies (#208584).
authorGunnar Wrobel <wrobel@gentoo.org>
Tue, 26 Feb 2008 07:11:17 +0000 (07:11 +0000)
committerGunnar Wrobel <wrobel@gentoo.org>
Tue, 26 Feb 2008 07:11:17 +0000 (07:11 +0000)
Package-Manager: portage-2.1.4_rc7

www-apps/mediawiki/ChangeLog
www-apps/mediawiki/Manifest
www-apps/mediawiki/files/postinstall-1.5-en.txt [deleted file]
www-apps/mediawiki/mediawiki-1.11.1.ebuild
www-apps/mediawiki/mediawiki-1.8.5.ebuild [deleted file]
www-apps/moinmoin/Manifest

index 836d42602c1e5637218253a4d1f75dca87ac1add..42ef0e174403a9dceca5e0135ac37264c26d2c78 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.97 2008/02/25 15:09:22 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.98 2008/02/26 07:11:16 wrobel Exp $
+
+  26 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org>
+  -files/postinstall-1.5-en.txt, -mediawiki-1.8.5.ebuild,
+  mediawiki-1.11.1.ebuild:
+  Remove vulnerable version (sec issue #207757) and fix dependencies (#208584).
 
   25 Feb 2008; Steve Dibb <beandog@gentoo.org> mediawiki-1.11.1.ebuild:
   amd64 stable, security bug 207757
index 08e8935ca1f8045814171ae4b72095bfcd1b31a9..9077e8d23bb4b3961dfb22452bb9a30f7cc9b7f5 100644 (file)
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX access_restrict.patch 1240 RMD160 29e27a84951daf447da1ecba3e929e94d02e0fb1 SHA1 1ec89557c26b682b2550ff95201a233eca471bec SHA256 22ca5d7e4cd6f3b03f2eb01a5e2ba0a1931998ff56ba3f1ebaa0a60cec436829
 AUX jobindexlength-mysql.patch 392 RMD160 a6031a663b1a4af2d15d1cb2ba7b659fe813a175 SHA1 1442974131d16077edccc4f9539a37838b737e14 SHA256 19cf34e4864fd7352b917905480bf9ca5a984ec4d8914990902c907381b0b79b
 AUX postinstall-1.11-en.txt 2502 RMD160 a72826f3b8e4b6461c50227d4db5ec5da79e710d SHA1 1dc394d76537ce7b24601bb63ec1ef7f2e49ad7f SHA256 d88c989eac3d99fec4c057eb89ec04a05aabfc57b6503b8da7843bfbc730daf4
-AUX postinstall-1.5-en.txt 2367 RMD160 5ace4659ea9d8faa9556fb4a693abad8a885258c SHA1 3057981fe89627053a2d31cd56ee44c69f05e5b5 SHA256 ef82063043a4d83f1a62e39266192d401f96b0999be0020b90eb48f8f683f70e
 DIST mediawiki-1.11.1.tar.gz 4885712 RMD160 c4ccc87acbbea4868094c83f58cf2142217d2267 SHA1 d452e0013969b064a2166eeae8d03227a8ff1fa3 SHA256 05173b49b73a289ff532baf4088215756804075394268b733ba2ae4265be9476
-DIST mediawiki-1.8.5.tar.gz 3497708 RMD160 74e7fc958c6e6cb5ad81967423f8de3b81405463 SHA1 b7b50ebf711988c6f35d0d9e436cfef5d5628da0 SHA256 cb2e25d74fdb841a56d54ee6de33183fba14b0266c01948b76892c3b7b287580
-EBUILD mediawiki-1.11.1.ebuild 4247 RMD160 02bf25b2bce6c2ba0f1951f861f8bf8d26e7f73d SHA1 9a2626f5967dba69549fe8bf3ee3b560669436e2 SHA256 ab2e557e22ecd93a75a3c68db7fb1a6f3fbede6d3c2d7ee1377a003d6b267cf7
-EBUILD mediawiki-1.8.5.ebuild 3571 RMD160 295a8e8bf279d5b73243743befa04073888a9e41 SHA1 89636bcd23f863b04cbe7abcf70094300955642b SHA256 8d7614aea499c6a09e6897cece172c93fd965fe6c59d961953a0521bb09f6c0d
-MISC ChangeLog 17512 RMD160 f43256edd3fd1844c221d99c223deddc0cb520e1 SHA1 9922c13d8e6de4c616711a362f0069697789bafd SHA256 b7a18318b9553fb378768e8bc6d79ede82ecb40cfafb2a643cc59f33e8089c31
+EBUILD mediawiki-1.11.1.ebuild 4266 RMD160 2cc576b19f1f7dc73ff275c217c2318a8e69d3ff SHA1 ec29455306e82a3e18c62874ebfd682e21a83f55 SHA256 88d7027ab14e7ef021bb6aa00e0c33271b68d863f93d5a42d712cdd1ee685a2e
+MISC ChangeLog 17726 RMD160 a9fba1feebd95a3768358fda2437edaf5f52b875 SHA1 d7179e6d5fcf94415853a4c8a48711ddab46257d SHA256 f47f89c7ab9fe9543879567a8a385e5a54d5ffab9491849e90fc3738b415c0b8
 MISC metadata.xml 366 RMD160 8be6da5afadbc6c6e57d589097d8f702d951bde3 SHA1 4c3b825388a712b4452ba16912b38b9aba76b78e SHA256 dddc4891c17811953d2cae412c4b1a713dc00b3629cd38a5b530c15a0acebcc2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHw7uaEEcxCpcDQ74RAjgTAJ9BwPCb25aLxZNC+IGjYljssomV3QCeJZOw
+9mLZHuldWsKvM1hOFEmSsTA=
+=Yxv9
+-----END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/files/postinstall-1.5-en.txt b/www-apps/mediawiki/files/postinstall-1.5-en.txt
deleted file mode 100644 (file)
index bf75ab7..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-
-Completing setup:
-
-To complete installation cd into the MediaWiki install location, but
-make sure to start mysql first with:
-
-$ /etc/init.d/mysql start
-
-$ cd /var/www/localhost/htdocs/mediawiki/
-
-The host directory, localhost, may change depending on your installation.
-
-Then temporarily make the MediaWiki /config directory writable
-to the  user the web server is running as. The quickest way is 
-to make  the directory world writable.  For example:
-
-$ chmod a+w config
- 
-Then access it, for example:
-
-lynx http://localhost/mediawiki/config/
- 
-After setup move the newly created LocalSettings.php from the config/
-directory to the main mediawiki directory, for example:
-  
-$ mv config/LocalSettings.php .
-
-    Remember to restore safe permissions to the MediaWiki config/ and
-    LocalSettings.php (which contains clear-text passwords).
-    chmod a-w config
-    chmod ug=r,o=  LocalSettings.php
-    chown root:apache LocalSettings.php
-
-After these steps MediaWiki should be accesable at
-http://localhost/mediawiki/
- 
-Enabling Optional Features:
-
-If you wish to enable image uploads then you must manually edit the
-LocalSettings.php file to uncomment the \$wgEnableUploads line.  
-If MediaWiki was built with the imagemagick USE-flag the directory
-permissions are correct, otherwise you must install ImageMagick and
-also adjust permissions on the images directory to allow the server
-to write.  For example:
- 
-$ chown apache:apache /var/www/localhost/htdocs/mediawiki/images
-
-Math Support:
-
-If you wish to enable the math support then you must manually edit" 
-the LocalSettings.php file to uncomment the \$wgUseTeX line.
-MediaWiki must have been built with the math USE-flag enabled or the
-necessary support executable will not be present.
-You may also have to execute
-
-$ texconfig dvips printcmd -
-
-if you have not configured tetex before.
-
-
-Things you need to have on the server:
-- SQL database of your choice.
-- dev-php/PEAR-Mail for external smtp server.
-
-These are not installed as dependencies since it is possible to run the database
-and other services on other machines.
-
-It is very important that you follow all the major versions upgrade
-instructions from the mediawiki.org web page,
-http://www.mediawiki.org/wiki/Manual:Upgrading 
-Do not, I repeat, do not assume that we can upgrade from version to version just like this. Make backups before upgrading.
-
index 7d7880130cf9145b595d0d2ef10a5dc68684996c..74ab5e3fa7bafa8ddd64f3d10e154ba94fe6aaf5 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.1.ebuild,v 1.5 2008/02/25 15:09:22 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.1.ebuild,v 1.6 2008/02/26 07:11:16 wrobel Exp $
 
 EAPI="1"
 inherit webapp depend.php versionator eutils
@@ -24,7 +24,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT="test"
 
-need_php5
+need_httpd_cgi
+need_php_httpd
 
 pkg_setup() {
        webapp_pkg_setup
diff --git a/www-apps/mediawiki/mediawiki-1.8.5.ebuild b/www-apps/mediawiki/mediawiki-1.8.5.ebuild
deleted file mode 100644 (file)
index 80e3958..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.5.ebuild,v 1.6 2007/11/26 12:00:23 tchiwam Exp $
-
-inherit webapp depend.php versionator
-
-MY_BRANCH=$(get_version_component_range 1-2)
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-HOMEPAGE="http://www.mediawiki.org"
-SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P/.0_/}.tar.gz"
-RESTRICT="mirror"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="imagemagick math mysql postgres restrict"
-
-S="${WORKDIR}/${P/.0_/}"
-
-DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
-
-RDEPEND="
-               >=dev-lang/php-5.1.4-r6
-               math? (
-                       virtual/tetex
-                       virtual/ghostscript
-                       media-gfx/imagemagick
-               )
-               imagemagick? (
-                       media-gfx/imagemagick
-               )
-"
-
-need_php
-
-pkg_setup() {
-       webapp_pkg_setup
-       require_php_with_use pcre session
-       if use mysql ; then
-               require_php_with_use mysql
-       fi
-       if use postgres ; then
-               require_php_with_use postgres
-       fi
-       require_gd
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/jobindexlength-mysql.patch"
-       if use restrict ; then
-               epatch "${FILESDIR}/access_restrict.patch"
-       fi
-}
-
-src_compile() {
-       if use math; then
-               einfo "Compiling math support"
-               cd math || die
-               emake || die
-       else
-               einfo "No math support enabled. Skipping."
-       fi
-
-       # TODO: think about includes/zhtable/ support
-}
-
-src_install() {
-       webapp_src_preinst
-
-       # copy the app's main files excluding math support, docs, and tests
-       local DIRS=(
-               "bin"
-               "config"
-               "extensions"
-               "images"
-               "includes"
-               "includes/api"
-               "includes/cbt"
-               "includes/normal"
-               "includes/templates"
-               "includes/zhtable"
-               "languages"
-               "languages/classes"
-               "languages/messages"
-               "locale"
-               "maintenance"
-               "maintenance/archives"
-               "maintenance/postgres"
-               "maintenance/dtrace"
-               "maintenance/mysql5"
-               "maintenance/storage"
-               "serialized"
-               "skins"
-               "skins/chick"
-               "skins/common"
-               "skins/common/images"
-               "skins/common/images/icons"
-               "skins/disabled"
-               "skins/htmldump"
-               "skins/monobook"
-               "skins/myskin"
-               "skins/simple"
-       )
-       insinto ${MY_HTDOCSDIR}
-       doins *.php *.inc *.phtml
-       for DIR in ${DIRS[*]}; do
-               dodir ${MY_HTDOCSDIR}/${DIR}
-               insinto ${MY_HTDOCSDIR}/${DIR}
-               doins ${DIR}/*
-               test -f ${DIR}/.htaccess && doins ${DIR}/.htaccess
-       done
-
-       # installing some docs
-       local DOCS=(
-               "AdminSettings.sample"
-               "COPYING"
-               "FAQ"
-               "HISTORY"
-               "INSTALL"
-               "README"
-               "RELEASE-NOTES"
-               "UPGRADE"
-       )
-       for DOC in ${DOCS[*]}; do
-               dodoc "${DOC}"
-               rm -f "${DOC}"
-       done
-       dodoc docs/*.txt
-       rm -f docs/*.txt
-
-       docinto php-memcached
-       dodoc docs/php-memcached/*
-
-       # If imagemagick is enabled then setup for image upload.
-       # We ensure the directory is prepared for writing.  The post-
-       # install instructions guide the user to enable the feature.
-       if use imagemagick; then
-               webapp_serverowned ${MY_HTDOCSDIR}/images
-       fi
-
-       # If we've enabled math USE-flag, install math support.
-       # We ensure the directories are prepared for writing.  The post-
-       # install instructions guide the user to enable the feature.
-       if use math; then
-               einfo "Installing math support"
-               dodir ${MY_HTDOCSDIR}/math
-               exeinto ${MY_HTDOCSDIR}/math
-               doexe math/texvc
-
-               # Docs
-               docinto math
-               dodoc math/README math/TODO
-
-               # Working directories.  Server writeable.
-               dodir ${MY_HTDOCSDIR}/images/math
-               webapp_serverowned ${MY_HTDOCSDIR}/images/math
-               dodir ${MY_HTDOCSDIR}/images/tmp
-               webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
-       fi
-
-       webapp_postinst_txt en "${FILESDIR}/postinstall-1.5-en.txt"
-       webapp_src_install
-}
index 8701623f9ce56a2da5f59f221df2524bbef61cac..ff64500409d4d47832f124163afaf1bee278143c 100644 (file)
@@ -1,8 +1,16 @@
+-----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.5.8.tar.gz 4351630 RMD160 a64374746eb677be11f1942588bda61986ff345e SHA1 fe0e2307cdd4f23b150567a377227bc795fece0f SHA256 569c9b4f7b2cf411718a3ac5e6427c1babacbaf1b085276f822d8d08040e4a8f
 DIST moin-1.6.1.tar.gz 5124404 RMD160 7a10dc035f88eaeaa456f45238209fcf49aabc92 SHA1 086ca44b04540c5c4cd6e4eeec7a7a2cf30c32ad SHA256 1e65b3120cbfad5054e6199dfdbe1d72699088934b45b3a49933140050c9f483
-EBUILD moinmoin-1.5.8.ebuild 1810 RMD160 aed70518b712063e83681c825627959937322d8d SHA1 1987aaa9dc0fc13721a42c9354afe772fc5db057 SHA256 1bf183482e6c6fcb001a985e7f7562e797336198aaae97f2c03d4dcd4398f685
 EBUILD moinmoin-1.6.1.ebuild 1751 RMD160 b2e0fac7a267f077af44e6de5b1f21c91b3258b9 SHA1 bd6a3ccfa67502131e4a884c2349093449aa809d SHA256 3793a254663566bed8024b9731ddc4ed67ac2adb28845a75c71e1d3002817e32
-MISC ChangeLog 7440 RMD160 88434ab78be5d59f350a9fbfee55b3c0c22ebd58 SHA1 b4a4da2bfd927ec8184c27c0977d43e0455cb550 SHA256 3746674331fd0f53d5b82a016a08e7cb13cda4b15fcfa91deeaaca9c8c5d5560
+MISC ChangeLog 7562 RMD160 28a49bb14801c18b5b72bf27a3de212fbcc7ecb8 SHA1 5969af0c3e72ced8b4cbca405636d2cd1741fc69 SHA256 9c8f56bfe5659792261827225c389b7829527e724fef67084e33beeb0e5028a1
 MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHw7xKEEcxCpcDQ74RAl28AJ9APBjS5ToxGOA92z8qM0eEIDJnHgCfcp3G
+WcXI3OBj54WdNtDnJoKq/pQ=
+=fFtz
+-----END PGP SIGNATURE-----