update to chora-1.2.2, includes the security fixes from previous commit
This commit is contained in:
avsm
parent
e8bb67e23c
commit
bb7427aea9
@ -1,13 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2004/06/12 19:18:36 avsm Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2004/06/12 21:53:50 avsm Exp $
|
||||
|
||||
COMMENT= "web-based CVS viewer module for Horde"
|
||||
|
||||
V= 1.2
|
||||
V= 1.2.2
|
||||
HORDE_MODULE= chora
|
||||
HORDE_NAME= Chora
|
||||
|
||||
DISTNAME= ${HORDE_MODULE}-${V}
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
CATEGORIES= devel www
|
||||
HOMEPAGE= http://www.horde.org/${HORDE_MODULE}/
|
||||
|
||||
@ -29,7 +28,6 @@ EXTRACT_ONLY=
|
||||
PREFIX= /var/www
|
||||
INSTDIR= ${PREFIX}/horde
|
||||
SUBST_VARS= INSTDIR HORDE_NAME HORDE_MODULE
|
||||
PATCH_LIST=
|
||||
|
||||
RUN_DEPENDS= :horde->=2.2.1:devel/horde
|
||||
|
||||
@ -39,7 +37,5 @@ pre-fake:
|
||||
do-install:
|
||||
@cd ${INSTDIR} && tar zxf ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX}
|
||||
@mv ${INSTDIR}/${HORDE_MODULE}-${V} ${INSTDIR}/${HORDE_MODULE}
|
||||
@cd ${INSTDIR}/${HORDE_MODULE} && ${PATCH} -s < ${PATCHDIR}/patch-diff.php \
|
||||
&& ${PATCH} -s < ${PATCHDIR}/patch-lib_CVSLib_Diff.php
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (chora-1.2.tar.gz) = 27438aa6319c408d93c52e1b25536f95
|
||||
RMD160 (chora-1.2.tar.gz) = 8e36883b654fd5c97e8505a37f4e9235ebf13ef2
|
||||
SHA1 (chora-1.2.tar.gz) = 2b03cc971ce2b372f7fdf6b83522a75cea98c290
|
||||
MD5 (chora-1.2.2.tar.gz) = 32017a2430971d501429b7dd5c1f5b95
|
||||
RMD160 (chora-1.2.2.tar.gz) = a19545e53f9c90269defcbe9e9df85839c3b6635
|
||||
SHA1 (chora-1.2.2.tar.gz) = f39b4c00d1af7e69e05b81c87c3baf0cb8910c8a
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-diff.php,v 1.1 2004/06/12 19:18:36 avsm Exp $
|
||||
===================================================================
|
||||
--- diff.php 2004/03/26 22:43:22 1.43.2.14
|
||||
+++ diff.php 2004/06/12 14:06:20 1.43.2.15
|
||||
@@ -23,7 +23,7 @@ if (!$r1) $r1 = Horde::getFormData('tr1'
|
||||
if (!$r2) $r2 = Horde::getFormData('tr2');
|
||||
|
||||
/* If no context-size has been specified, default to 3. */
|
||||
-$num = Horde::getFormData('num', 3);
|
||||
+$num = (int)Horde::getFormData('num', 3);
|
||||
|
||||
/* If no type has been specified, then default to human readable. */
|
||||
$ty = Horde::getFormData('ty', 'h');
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-lib_CVSLib_Diff.php,v 1.1 2004/06/12 19:18:36 avsm Exp $
|
||||
===================================================================
|
||||
--- lib/CVSLib/Diff.php 2002/12/28 18:54:02 1.18.2.4
|
||||
+++ lib/CVSLib/Diff.php 2004/06/12 14:06:20 1.18.2.5
|
||||
@@ -56,10 +56,10 @@ class CVSLib_Diff {
|
||||
}
|
||||
switch ($type) {
|
||||
case CVSLIB_DIFF_CONTEXT:
|
||||
- $options = $opts . '-p --context=' . $num;
|
||||
+ $options = $opts . '-p --context=' . (int)$num;
|
||||
break;
|
||||
case CVSLIB_DIFF_UNIFIED:
|
||||
- $options = $opts . '-p --unified=' . $num;
|
||||
+ $options = $opts . '-p --unified=' . (int)$num;
|
||||
break;
|
||||
case CVSLIB_DIFF_COLUMN:
|
||||
$options = $opts . '--side-by-side --width=120';
|
||||
@ -6,5 +6,4 @@ ${INSTDIR}/${HORDE_MODULE}/docs/INSTALL
|
||||
|
||||
Before installing ${HORDE_NAME}, make sure that Horde is correctly
|
||||
configured and working first!
|
||||
|
||||
==============================================================
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2003/04/03 11:30:53 avsm Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2004/06/12 21:53:50 avsm Exp $
|
||||
horde/chora/COPYING
|
||||
horde/chora/README
|
||||
horde/chora/annotate.php
|
||||
@ -18,6 +18,7 @@ horde/chora/docs/CHANGES
|
||||
horde/chora/docs/CREDITS
|
||||
horde/chora/docs/GOALS
|
||||
horde/chora/docs/INSTALL
|
||||
horde/chora/docs/RELEASE_NOTES
|
||||
horde/chora/graphics/back.gif
|
||||
horde/chora/graphics/chora.gif
|
||||
horde/chora/graphics/deleted.gif
|
||||
@ -54,7 +55,10 @@ horde/chora/locale/nb_NO/LC_MESSAGES/chora.mo
|
||||
horde/chora/locale/nl_NL/LC_MESSAGES/chora.mo
|
||||
horde/chora/locale/pl_PL/LC_MESSAGES/chora.mo
|
||||
horde/chora/locale/pt_BR/LC_MESSAGES/chora.mo
|
||||
horde/chora/locale/ro_RO/LC_MESSAGES/chora.mo
|
||||
horde/chora/locale/sv_SE/LC_MESSAGES/chora.mo
|
||||
horde/chora/locale/zh_CN/LC_MESSAGES/chora.mo
|
||||
horde/chora/locale/zh_TW/LC_MESSAGES/chora.mo
|
||||
horde/chora/menu.php
|
||||
horde/chora/po/.htaccess
|
||||
horde/chora/po/Makefile
|
||||
@ -70,9 +74,12 @@ horde/chora/po/nb_NO.po
|
||||
horde/chora/po/nl_NL.po
|
||||
horde/chora/po/pl_PL.po
|
||||
horde/chora/po/pt_BR.po
|
||||
horde/chora/po/ro_RO.po
|
||||
horde/chora/po/shtool
|
||||
horde/chora/po/sv_SE.po
|
||||
horde/chora/po/xgettext.sh
|
||||
horde/chora/po/zh_CN.po
|
||||
horde/chora/po/zh_TW.po
|
||||
horde/chora/prefs.php
|
||||
horde/chora/status.php
|
||||
horde/chora/templates/.htaccess
|
||||
@ -122,8 +129,14 @@ horde/chora/templates/menu/menu.inc
|
||||
@dirrm horde/chora/templates/annotate
|
||||
@dirrm horde/chora/templates
|
||||
@dirrm horde/chora/po
|
||||
@dirrm horde/chora/locale/zh_TW/LC_MESSAGES
|
||||
@dirrm horde/chora/locale/zh_TW
|
||||
@dirrm horde/chora/locale/zh_CN/LC_MESSAGES
|
||||
@dirrm horde/chora/locale/zh_CN
|
||||
@dirrm horde/chora/locale/sv_SE/LC_MESSAGES
|
||||
@dirrm horde/chora/locale/sv_SE
|
||||
@dirrm horde/chora/locale/ro_RO/LC_MESSAGES
|
||||
@dirrm horde/chora/locale/ro_RO
|
||||
@dirrm horde/chora/locale/pt_BR/LC_MESSAGES
|
||||
@dirrm horde/chora/locale/pt_BR
|
||||
@dirrm horde/chora/locale/pl_PL/LC_MESSAGES
|
||||
|
||||
Loading…
Reference in New Issue
Block a user