diff options
| -rw-r--r-- | www-apps/tikiwiki/ChangeLog | 12 | ||||
| -rw-r--r-- | www-apps/tikiwiki/Manifest | 15 | ||||
| -rw-r--r-- | www-apps/tikiwiki/files/digest-tikiwiki-1.8.5-r1 | 1 | ||||
| -rw-r--r-- | www-apps/tikiwiki/files/digest-tikiwiki-1.9.0 | 1 | ||||
| -rw-r--r-- | www-apps/tikiwiki/files/tikiwiki-1.8.5-xmlrpc.patch | 29 | ||||
| -rw-r--r-- | www-apps/tikiwiki/tikiwiki-1.8.5-r1.ebuild | 89 | ||||
| -rw-r--r-- | www-apps/tikiwiki/tikiwiki-1.9.0.ebuild | 95 |
7 files changed, 16 insertions, 226 deletions
diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog index 84eaf3372a00..e132eb86f829 100644 --- a/www-apps/tikiwiki/ChangeLog +++ b/www-apps/tikiwiki/ChangeLog @@ -1,11 +1,21 @@ # ChangeLog for www-apps/tikiwiki # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.15 2005/08/22 20:18:42 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.16 2005/08/22 22:10:14 rl03 Exp $ + + 22 Aug 2005; Renat Lumpau <rl03@gentoo.org> + -files/tikiwiki-1.8.5-xmlrpc.patch, -tikiwiki-1.8.5-r1.ebuild, + -tikiwiki-1.9.0.ebuild: + Removing vulnerable versions 22 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> tikiwiki-1.8.5-r2.ebuild: Stable on ppc. + 22 Aug 2005; Renat Lumpau <rl03@gentoo.org> + -files/tikiwiki-1.8.5-xmlrpc.patch, -tikiwiki-1.8.5-r1.ebuild, + -tikiwiki-1.9.0.ebuild: + Removing vulnerable versions + 21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/xmlrpc2-1.8.5.patch, files/xmlrpc2-1.9.0.patch: Fixed broken patches diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest index 0a495cb31afb..2c8f7d2bc650 100644 --- a/www-apps/tikiwiki/Manifest +++ b/www-apps/tikiwiki/Manifest @@ -1,14 +1,9 @@ MD5 99b47adaab8cbfdb8c4134bcc79e0c8e tikiwiki-1.9.0-r1.ebuild 2585 -MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280 -MD5 1e194e215388c679f8ab7037d0c581d5 ChangeLog 4351 MD5 9e6f558c7e3fe223eb0f506f6e62b429 tikiwiki-1.8.5-r2.ebuild 2329 -MD5 9428e2c5313b6733e9476a441c3eb576 tikiwiki-1.8.5-r1.ebuild 2339 -MD5 3df178d3364ec7a6fd53340327e0cd3b tikiwiki-1.9.0.ebuild 2590 -MD5 b0e0921fd97e18c1e6746aacc75f87fa files/tikiwiki-1.8.5-xmlrpc.patch 1093 -MD5 28eb632d3d2985010cc05afcd084acd4 files/digest-tikiwiki-1.9.0 68 -MD5 f9b53d80344d059dda253d001af38c8c files/xmlrpc2-1.9.0.patch 2587 -MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r2 68 +MD5 d4cdc5ce70b20e40d1158b970930a770 ChangeLog 4520 +MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280 MD5 a43526d55fa814d5e9af0042767a6600 files/postinstall-en.txt 1407 -MD5 b0640c9b04a5e76a0a888afbe7860c41 files/xmlrpc2-1.8.5.patch 2587 -MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r1 68 +MD5 6366ec5badc9e0d9d20befdf8052c73a files/digest-tikiwiki-1.8.5-r2 68 MD5 28eb632d3d2985010cc05afcd084acd4 files/digest-tikiwiki-1.9.0-r1 68 +MD5 f9b53d80344d059dda253d001af38c8c files/xmlrpc2-1.9.0.patch 2587 +MD5 b0640c9b04a5e76a0a888afbe7860c41 files/xmlrpc2-1.8.5.patch 2587 diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5-r1 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5-r1 deleted file mode 100644 index fd9e2fe7ff1d..000000000000 --- a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.5-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 e64dc5ffcee6699993e90ea1ed8ce1af tikiwiki-1.8.5.tar.bz2 5706055 diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0 b/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0 deleted file mode 100644 index baa90951f379..000000000000 --- a/www-apps/tikiwiki/files/digest-tikiwiki-1.9.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 524deba410cc17048781b3a999d7b509 tikiwiki-1.9.0.tar.bz2 6007822 diff --git a/www-apps/tikiwiki/files/tikiwiki-1.8.5-xmlrpc.patch b/www-apps/tikiwiki/files/tikiwiki-1.8.5-xmlrpc.patch deleted file mode 100644 index 4e037374f58e..000000000000 --- a/www-apps/tikiwiki/files/tikiwiki-1.8.5-xmlrpc.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- tikiwiki-1.8.5/lib/xmlrpc.inc.old 2005-07-04 22:45:18.000000000 +0200 -+++ tikiwiki-1.8.5/lib/xmlrpc.inc 2002-10-15 17:42:38.000000000 +0200 -@@ -160,7 +160,7 @@ - $_xh[$parser]['qt']=0; - break; - case "NAME": -- $_xh[$parser]['st'].="'"; $_xh[$parser]['ac']=""; -+ $_xh[$parser]['st'].='"'; $_xh[$parser]['ac']=""; - break; - case "FAULT": - $_xh[$parser]['isf']=1; -@@ -225,7 +225,7 @@ - $_xh[$parser]['cm']--; - break; - case "NAME": -- $_xh[$parser]['st'].= $_xh[$parser]['ac'] . "' => "; -+ $_xh[$parser]['st'].= $_xh[$parser]['ac'] . '" => '; - break; - case "BOOLEAN": - // special case here: we translate boolean 1 or 0 into PHP -@@ -246,7 +246,7 @@ - // we use double quotes rather than single so backslashification works OK - $_xh[$parser]['st'].="\"". $_xh[$parser]['ac'] . "\""; - } else if ($_xh[$parser]['qt']==2) { -- $_xh[$parser]['st'].="base64_decode('". $_xh[$parser]['ac'] . "')"; -+ $_xh[$parser]['st'].='base64_decode("'. $_xh[$parser]['ac'] . '")'; - } else if ($name=="BOOLEAN") { - $_xh[$parser]['st'].=$_xh[$parser]['ac']; - } else { diff --git a/www-apps/tikiwiki/tikiwiki-1.8.5-r1.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.5-r1.ebuild deleted file mode 100644 index 81aa6fcc74fd..000000000000 --- a/www-apps/tikiwiki/tikiwiki-1.8.5-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.5-r1.ebuild,v 1.2 2005/07/09 18:57:48 swegener Exp $ - -inherit eutils webapp - -DESCRIPTION="Full featured Web Content Management System using Php and Smarty Templates" -HOMEPAGE="http://tikiwiki.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -IUSE="" -KEYWORDS="~x86 ppc ~sparc ~amd64" - -RDEPEND="virtual/php - media-gfx/graphviz" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/tikiwiki-1.8.5-xmlrpc.patch -} - -src_install() { - webapp_src_preinst - - local DIR - local DIRENTRY - local DIRS="backups db dump img/wiki - img/wiki_up modules/cache temp temp/cache - templates_c templates styles lib/Galaxia/processes" - - - # Ensure that directories exist, some don't. - # (part of setup.sh) - # - for DIR in ${DIRS}; do - mkdir -p ${DIR} - done - - # Remove the execute permission from the setup.sh script - # and rename it. Its actions have been incorporated here. - # - chmod a-x setup.sh - mv setup.sh setup.sh.done - - # Install the minimal doc (points to web page) - # - dodoc doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README - - # The bulk goes into htdocs - # but don't copy INSTALL and README - cp -a [[:lower:]]* ${D}/${MY_HTDOCSDIR} - - # Recursively set server ownership to allow server to write - # This is the rough equivalent of the setup.sh script - # provided in the distribution. - # Note: Cannot use xargs or find -exec here because - # these don't work with shell functions. - # - webapp_serverowned ${MY_HTDOCSDIR} - for DIR in ${DIRS}; do - find ${DIR} | while read DIRENTRY; do - webapp_serverowned ${MY_HTDOCSDIR}/${DIRENTRY} - done - done - - # Flag files for scripting engine - # - find . -name '*.php' -a ! -name '*.inc.php' | while read DIRENTRY; do - webapp_runbycgibin php ${MY_HTDOCSDIR}/${DIRENTRY} - done - - # Setup some post-install notes for webapp-config - # - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt - - webapp_src_install -} - -pkg_config() { - einfo "Type in your MySQL root password to create an empty tiki database:" - mysqladmin -u root -p create tikiwiki - einfo - einfo - einfo "Now, point your browser to the location of tiki-install.php" - einfo " ==> e.g. http://localhost/tikiwiki/tiki-install.php" - einfo -} diff --git a/www-apps/tikiwiki/tikiwiki-1.9.0.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.0.ebuild deleted file mode 100644 index c41988734588..000000000000 --- a/www-apps/tikiwiki/tikiwiki-1.9.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.0.ebuild,v 1.1 2005/07/07 21:47:19 rl03 Exp $ - -inherit webapp eutils - -DESCRIPTION="Full featured Web Content Management System using Php and Smarty Templates" -HOMEPAGE="http://tikiwiki.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -IUSE="mysql postgres graphviz" -KEYWORDS="~x86 ~ppc ~sparc ~amd64" - -RDEPEND=">=virtual/php-4.3 - mysql? ( >=dev-db/mysql-4 ) - postgres? ( dev-db/postgresql ) - graphviz? ( media-gfx/graphviz ) -" -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/tikiwiki-1.8.5-xmlrpc.patch -} - -pkg_setup () { - webapp_pkg_setup - einfo "Make sure your PHP is compiled with mysql or postgres support" - einfo "If you need PDF generation, make sure your PHP is emerged with xml2" -} - -src_install() { - webapp_src_preinst - - local DIR - local DIRENTRY - local DIRS="backups db dump files img/wiki - img/wiki_up modules/cache temp temp/cache - templates_c templates styles maps whelp mods - lib/Galaxia/processes" - - - # Ensure that directories exist, some don't. - # (part of setup.sh) - # - for DIR in ${DIRS}; do - mkdir -p ${DIR} - done - - # Remove the execute permission from the setup.sh script - # and rename it. Its actions have been incorporated here. - # - chmod a-x setup.sh - mv setup.sh setup.sh.done - - # Install the minimal doc (points to web page) - # - dodoc doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README - - # The bulk goes into htdocs - # but don't copy INSTALL and README - cp -a [[:lower:]]* ${D}/${MY_HTDOCSDIR} - - # Recursively set server ownership to allow server to write - # This is the rough equivalent of the setup.sh script - # provided in the distribution. - # Note: Cannot use xargs or find -exec here because - # these don't work with shell functions. - # - webapp_serverowned ${MY_HTDOCSDIR} - for DIR in ${DIRS}; do - find ${DIR} | while read DIRENTRY; do - webapp_serverowned ${MY_HTDOCSDIR}/${DIRENTRY} - done - done - webapp_serverowned ${MY_HTDOCSDIR}/tiki-install.php - - # Setup some post-install notes for webapp-config - # - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt - - webapp_src_install -} - -pkg_config() { - einfo "Type in your MySQL root password to create an empty tiki database:" - mysqladmin -u root -p create tikiwiki -} - -pkg_postinst() { - einfo "To setup a MySQL database, run:" - einfo "\"ebuild /var/db/pkg/www-apps/${PF}/${PF}.ebuild config\"" - einfo "If you are using PostgreSQL, consult your documentation" - webapp_pkg_postinst -} |