summaryrefslogtreecommitdiff
path: root/www/contao29
diff options
context:
space:
mode:
authortaca <taca>2010-08-10 15:37:32 +0000
committertaca <taca>2010-08-10 15:37:32 +0000
commitbecfae93cf28f0ede2fd3159ff47e51ecb709ccd (patch)
tree117da9a35bf24be671672d42d386c4cd8628121f /www/contao29
parentf067d6b232e22ada65f84a1172db1f666c2af470 (diff)
downloadpkgsrc-becfae93cf28f0ede2fd3159ff47e51ecb709ccd.tar.gz
Update contao29 package to 2.9.1.
Contao 2.9.1 is available August 9th, 2010 11:24 by Leo Feyer Contao version 2.9.1 is available. The maintenance release includes an important front end cache fix, a front end preview link fix and various accessibility fixes. It also fixes an XSS vulnerability in one of the framework functions, so an update is highly recommended.
Diffstat (limited to 'www/contao29')
-rw-r--r--www/contao29/Makefile3
-rw-r--r--www/contao29/Makefile.version4
-rw-r--r--www/contao29/distinfo10
-rw-r--r--www/contao29/patches/patch-aa100
-rw-r--r--www/contao29/patches/patch-ab23
5 files changed, 7 insertions, 133 deletions
diff --git a/www/contao29/Makefile b/www/contao29/Makefile
index 8442984241c..13b5491012a 100644
--- a/www/contao29/Makefile
+++ b/www/contao29/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/08/06 03:43:28 taca Exp $
+# $NetBSD: Makefile,v 1.6 2010/08/10 15:37:32 taca Exp $
#
DISTNAME= contao-${CT_VERSION}
PKGNAME= contao${CT_VER}-${CT_PKGVER}
-PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=typolight/}
diff --git a/www/contao29/Makefile.version b/www/contao29/Makefile.version
index e5b2e1ce7a2..dca469e7eed 100644
--- a/www/contao29/Makefile.version
+++ b/www/contao29/Makefile.version
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.version,v 1.1.1.1 2010/07/05 14:45:21 taca Exp $
+# $NetBSD: Makefile.version,v 1.2 2010/08/10 15:37:32 taca Exp $
#
# used by www/contao29/Makefile
# used by www/contao29-example/Makefile
# used by www/contao29-translations/Makefile
#
-CT_VERSION= 2.9.0
+CT_VERSION= 2.9.1
diff --git a/www/contao29/distinfo b/www/contao29/distinfo
index b0902586479..0177cbabe4d 100644
--- a/www/contao29/distinfo
+++ b/www/contao29/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.2 2010/07/28 16:28:51 taca Exp $
+$NetBSD: distinfo,v 1.3 2010/08/10 15:37:32 taca Exp $
-SHA1 (contao-2.9.0.tar.gz) = 9635d7d9251e4dfe965392ed2b2cc1f2a55f8cf9
-RMD160 (contao-2.9.0.tar.gz) = cbe78ac77e2222c8d6571d9a67a25c796e60b89e
-Size (contao-2.9.0.tar.gz) = 4335596 bytes
-SHA1 (patch-aa) = d49fa25b1549764f95d0354b10a80cf31de6ec19
-SHA1 (patch-ab) = 207ce919bb6fa7148108f8bd075d3a7d7ad1eeb9
+SHA1 (contao-2.9.1.tar.gz) = f4d8c41172d9e16d713711cd75621883e34bf27d
+RMD160 (contao-2.9.1.tar.gz) = cb9a9e805854d93bd17905dca4f7c46b972efd51
+Size (contao-2.9.1.tar.gz) = 4345172 bytes
diff --git a/www/contao29/patches/patch-aa b/www/contao29/patches/patch-aa
deleted file mode 100644
index 682be000e65..00000000000
--- a/www/contao29/patches/patch-aa
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/07/28 16:28:51 taca Exp $
-
-Fix preview problem when URL rewriting is enabled from repository, r513.
-
---- contao/main.php.orig 2010-06-04 11:45:49.000000000 +0000
-+++ contao/main.php
-@@ -235,53 +235,57 @@ class Main extends Backend
- $this->Template->be27 = !$GLOBALS['TL_CONFIG']['oldBeTheme'];
- $this->Template->home = $GLOBALS['TL_LANG']['MSC']['home'];
- $this->Template->backToTop = $GLOBALS['TL_LANG']['MSC']['backToTop'];
-+ $this->Template->frontendFile = $GLOBALS['TL_CONFIG']['rewriteURL'] ? '' : 'index.php';
-
-- $this->Template->frontendFile = 'index.php';
--
-- // Preview pages
-- if ($this->Input->get('do') == 'page' && strlen(CURRENT_ID))
-+ // Front end preview links
-+ if (CURRENT_ID != '')
- {
-- $objPreview = $this->Database->prepare("SELECT id, alias FROM tl_page WHERE id=?")
-- ->limit(1)
-- ->execute(CURRENT_ID);
--
-- if ($objPreview->numRows)
-+ // Pages
-+ if ($this->Input->get('do') == 'page')
- {
-- if ($GLOBALS['TL_CONFIG']['disableAlias'])
-- {
-- $this->Template->frontendFile = 'index.php?id=' . $objPreview->id;
-- }
-- else
-+ $objPreview = $this->Database->prepare("SELECT id, alias FROM tl_page WHERE id=?")
-+ ->limit(1)
-+ ->execute(CURRENT_ID);
-+
-+ if ($objPreview->numRows)
- {
-- $this->Template->frontendFile = 'index.php/' . (strlen($objPreview->alias) ? $objPreview->alias : $objPreview->id) . $GLOBALS['TL_CONFIG']['urlSuffix'];
-+ if ($GLOBALS['TL_CONFIG']['disableAlias'])
-+ {
-+ $this->Template->frontendFile .= '?id=' . $objPreview->id;
-+ }
-+ else
-+ {
-+ $this->Template->frontendFile .= ($GLOBALS['TL_CONFIG']['rewriteURL'] ? '' : '/') . (($objPreview->alias != '') ? $objPreview->alias : $objPreview->id) . $GLOBALS['TL_CONFIG']['urlSuffix'];
-+ }
- }
- }
-- }
--
-- // Preview article
-- if ($this->Input->get('do') == 'article' && strlen(CURRENT_ID))
-- {
-- $objPreview = $this->Database->prepare("SELECT p.id AS pid, p.alias AS palias, a.id AS aid, a.alias AS aalias, a.inColumn AS acolumn FROM tl_article a, tl_page p WHERE a.id=? AND a.pid=p.id")
-- ->limit(1)
-- ->execute(CURRENT_ID);
--
-- if ($objPreview->numRows)
-+ // Articles
-+ elseif ($this->Input->get('do') == 'article')
- {
-- $strColumn = '';
-+ $objPreview = $this->Database->prepare("SELECT p.id AS pid, p.alias AS palias, a.id AS aid, a.alias AS aalias, a.inColumn AS acolumn FROM tl_article a, tl_page p WHERE a.id=? AND a.pid=p.id")
-+ ->limit(1)
-+ ->execute(CURRENT_ID);
-
-- if ($objPreview->acolumn != 'main')
-+ if ($objPreview->numRows)
- {
-- $strColumn = $objPreview->acolumn . ':';
-- }
-+ $strColumn = '';
-
-- if ($GLOBALS['TL_CONFIG']['disableAlias'])
-- {
-- $this->Template->frontendFile = 'index.php?id=' . $objPreview->pid . '&amp;articles=' . $strColumn . $objPreview->aid;
-- }
-- else
-- {
-- $this->Template->frontendFile = 'index.php/' . (strlen($objPreview->palias) ? $objPreview->palias : $objPreview->pid) . '/articles/' . $strColumn . (strlen($objPreview->aalias) ? $objPreview->aalias : $objPreview->aid) . $GLOBALS['TL_CONFIG']['urlSuffix'];
-+ if ($objPreview->acolumn != 'main')
-+ {
-+ $strColumn = $objPreview->acolumn . ':';
-+ }
-+
-+ if ($GLOBALS['TL_CONFIG']['disableAlias'])
-+ {
-+ $this->Template->frontendFile .= '?id=' . $objPreview->pid . '&articles=' . $strColumn . $objPreview->aid;
-+ }
-+ else
-+ {
-+ $this->Template->frontendFile .= ($GLOBALS['TL_CONFIG']['rewriteURL'] ? '' : '/') . (($objPreview->palias != '') ? $objPreview->palias : $objPreview->pid) . '/articles/' . $strColumn . (($objPreview->aalias != '') ? $objPreview->aalias : $objPreview->aid) . $GLOBALS['TL_CONFIG']['urlSuffix'];
-+ }
- }
-+
-+ $this->Template->frontendFile = str_replace(array('?', '&', '='), array('%3F', '%26', '%3D'), $this->Template->frontendFile);
- }
- }
-
diff --git a/www/contao29/patches/patch-ab b/www/contao29/patches/patch-ab
deleted file mode 100644
index b90febbd2f2..00000000000
--- a/www/contao29/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/07/28 16:28:51 taca Exp $
-
-Fix for CSS from repository, r507.
-
---- system/modules/frontend/Frontend.php.orig 2010-04-19 10:22:31.000000000 +0000
-+++ system/modules/frontend/Frontend.php
-@@ -166,8 +166,16 @@ abstract class Frontend extends Controll
- protected function addToUrl($strRequest, $blnIgnoreParams=false)
- {
- $arrGet = $blnIgnoreParams ? array() : $_GET;
-+
-+ // Clean the $_GET values (thanks to thyon)
-+ foreach (array_keys($arrGet) as $key)
-+ {
-+ $arrGet[$key] = $this->Input->get($key, true);
-+ }
-+
- $arrFragments = preg_split('/&(amp;)?/i', $strRequest);
-
-+ // Merge the new request string
- foreach ($arrFragments as $strFragment)
- {
- list($key, $value) = explode('=', $strFragment);