From d288ed26e8f129e44052cecc8cc99896adc036e4 Mon Sep 17 00:00:00 2001 From: mbalmer Date: Thu, 8 May 2008 09:57:56 +0000 Subject: [PATCH] Minor security update to Kronolith 2.1.8. Change the way the package is built by first unpacking the distfile so it can be patched. Sprinkle a few SQL typecasts where needed to make Kronolith happy again with PostgreSQL 8.3.x. Discussed with simon. --- www/kronolith/Makefile | 9 +++---- www/kronolith/distinfo | 10 +++---- .../patches/patch-lib_Driver_sql_php | 26 +++++++++++++++++++ www/kronolith/pkg/PLIST | 5 +++- 4 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 www/kronolith/patches/patch-lib_Driver_sql_php diff --git a/www/kronolith/Makefile b/www/kronolith/Makefile index 8bf1c4abf79..80065dba544 100644 --- a/www/kronolith/Makefile +++ b/www/kronolith/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2008/01/09 23:02:38 mbalmer Exp $ +# $OpenBSD: Makefile,v 1.18 2008/05/08 09:57:56 mbalmer Exp $ COMMENT= web based calendar application using the horde framework HORDE_MODULE= kronolith HORDE_NAME= Kronolith -DISTNAME= ${HORDE_MODULE}-h3-2.1.7 +DISTNAME= ${HORDE_MODULE}-h3-2.1.8 CATEGORIES= www mail HOMEPAGE= http://www.horde.org/${HORDE_MODULE}/ @@ -22,7 +22,6 @@ MASTER_SITES= ${MASTER_SITE_HORDE:=kronolith/} NO_BUILD= Yes NO_REGRESS= Yes PKG_ARCH= * -EXTRACT_ONLY= PREFIX= /var/www INSTDIR= ${PREFIX}/horde @@ -36,7 +35,7 @@ pre-fake: ${INSTALL_DATA_DIR} ${INSTDIR} do-install: - @cd ${INSTDIR} && tar zxf ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} - @mv ${INSTDIR}/${DISTNAME} ${INSTDIR}/${HORDE_MODULE} + mv ${WRKDIST} ${INSTDIR}/${HORDE_MODULE} + find ${INSTDIR}/${HORDE_MODULE} -name \*.orig -exec rm {} \; .include diff --git a/www/kronolith/distinfo b/www/kronolith/distinfo index 032baa9c612..0eebac23f9c 100644 --- a/www/kronolith/distinfo +++ b/www/kronolith/distinfo @@ -1,5 +1,5 @@ -MD5 (kronolith-h3-2.1.7.tar.gz) = MfN1DMAduNe0v9smTkDw+w== -RMD160 (kronolith-h3-2.1.7.tar.gz) = sMXw1xfEaY9aUIUXFesTuxXCrK0= -SHA1 (kronolith-h3-2.1.7.tar.gz) = rI54m/WFmvSXlOYksgi9Nt/8ZGw= -SHA256 (kronolith-h3-2.1.7.tar.gz) = A5Od8PIEP2XVIqNM3rIMVn/PdNnl2Zqm44r6eiqz8lM= -SIZE (kronolith-h3-2.1.7.tar.gz) = 1850490 +MD5 (kronolith-h3-2.1.8.tar.gz) = iXBpfy60HOMbIE1x+cQk5Q== +RMD160 (kronolith-h3-2.1.8.tar.gz) = IfatjyJz7qMb5MQU7/W/2KNvpFc= +SHA1 (kronolith-h3-2.1.8.tar.gz) = 5gvdcqtldlA6it60GSFYT+KXv3s= +SHA256 (kronolith-h3-2.1.8.tar.gz) = DVyM+36l7xWz8f5ECK1mi9ud6qzc78GGIUlU5FKvLJo= +SIZE (kronolith-h3-2.1.8.tar.gz) = 1920783 diff --git a/www/kronolith/patches/patch-lib_Driver_sql_php b/www/kronolith/patches/patch-lib_Driver_sql_php new file mode 100644 index 00000000000..ab95a1f4240 --- /dev/null +++ b/www/kronolith/patches/patch-lib_Driver_sql_php @@ -0,0 +1,26 @@ +$OpenBSD: patch-lib_Driver_sql_php,v 1.1 2008/05/08 09:57:56 mbalmer Exp $ +--- lib/Driver/sql.php.orig Thu Mar 8 14:52:35 2007 ++++ lib/Driver/sql.php Thu May 8 11:47:41 2008 +@@ -271,17 +271,17 @@ class Kronolith_Driver_sql extends Kronolith_Driver { + $etime = sprintf('%04d-%02d-%02d 00:00:00', $endInterval->year, $endInterval->month, $endInterval->mday); + if (isset($startInterval)) { + $stime = sprintf('%04d-%02d-%02d 00:00:00', $startInterval->year, $startInterval->month, $startInterval->mday); +- $q .= 'event_end > ? AND '; ++ $q .= 'event_end > CAST(? as timestamp) AND '; + $values[] = $stime; + } +- $q .= 'event_start < ?) OR ('; ++ $q .= 'event_start < CAST(? as timestamp)) OR ('; + $values[] = $etime; + if (isset($stime)) { +- $q .= 'event_recurenddate >= ? AND '; ++ $q .= 'event_recurenddate >= CAST(? as timestamp) AND '; + $values[] = $stime; + } +- $q .= 'event_start <= ?' . +- ' AND event_recurtype <> ?))'; ++ $q .= 'event_start <= CAST(? as timestamp)' . ++ ' AND event_recurtype <> CAST(? as varchar)))'; + array_push($values, $etime, KRONOLITH_RECUR_NONE); + + // Log the query at a DEBUG log level. diff --git a/www/kronolith/pkg/PLIST b/www/kronolith/pkg/PLIST index 9e58b0da9b2..b45512a5d4f 100644 --- a/www/kronolith/pkg/PLIST +++ b/www/kronolith/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2007/05/05 13:59:52 mbalmer Exp $ +@comment $OpenBSD: PLIST,v 1.10 2008/05/08 09:57:56 mbalmer Exp $ horde/${HORDE_MODULE}/ horde/${HORDE_MODULE}/COPYING horde/${HORDE_MODULE}/README @@ -170,6 +170,8 @@ horde/${HORDE_MODULE}/locale/sv_SE/ horde/${HORDE_MODULE}/locale/sv_SE/LC_MESSAGES/ horde/${HORDE_MODULE}/locale/sv_SE/LC_MESSAGES/${HORDE_MODULE}.mo horde/${HORDE_MODULE}/locale/tr_TR/ +horde/${HORDE_MODULE}/locale/tr_TR/LC_MESSAGES/ +horde/${HORDE_MODULE}/locale/tr_TR/LC_MESSAGES/${HORDE_MODULE}.mo horde/${HORDE_MODULE}/locale/tr_TR/help.xml horde/${HORDE_MODULE}/locale/zh_CN/ horde/${HORDE_MODULE}/locale/zh_CN/LC_MESSAGES/ @@ -208,6 +210,7 @@ horde/${HORDE_MODULE}/po/ru_RU.po horde/${HORDE_MODULE}/po/sk_SK.po horde/${HORDE_MODULE}/po/sl_SI.po horde/${HORDE_MODULE}/po/sv_SE.po +horde/${HORDE_MODULE}/po/tr_TR.po horde/${HORDE_MODULE}/po/zh_CN.po horde/${HORDE_MODULE}/po/zh_TW.po horde/${HORDE_MODULE}/scripts/