summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authormrauch <mrauch>2005-04-14 21:06:44 +0000
committermrauch <mrauch>2005-04-14 21:06:44 +0000
commit91dd638f25da6b3af7584e013ff3f09bfaf22312 (patch)
tree0d1d2c1dcbd2b46c28076f829d797ba93c969b6e /misc
parent1841f20f2f3e4cc794c51f8edc69f40d93224a1b (diff)
downloadpkgsrc-91dd638f25da6b3af7584e013ff3f09bfaf22312.tar.gz
Apply fix for security problem CAN-2005-0941 by installing patched library.
Bump PKGREVISION.
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice-bin/Makefile9
-rw-r--r--misc/openoffice-bin/distinfo5
2 files changed, 12 insertions, 2 deletions
diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile
index 2b1b081f1a3..f061ad7adda 100644
--- a/misc/openoffice-bin/Makefile
+++ b/misc/openoffice-bin/Makefile
@@ -1,12 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2005/04/02 15:46:39 mrauch Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/14 21:06:44 mrauch Exp $
PKGNAME= openoffice-bin-${OO_VER}
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+= openoffice-linux-112-services.rdb.bz2
+DISTFILES+= libsot645li.so
SITES_openoffice-linux-112-services.rdb.bz2=http://www.fs.tum.de/~mrauch/OpenOffice/download/\
ftp://ftp.NetBSD.org/pub/NetBSD/misc/mrauch/
+SITES_libsot645li.so= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}secpatch/}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
+ openoffice-linux-112-services.rdb.bz2
MAINTAINER= mrauch@NetBSD.org
HOMEPAGE= http://www.openoffice.org/
@@ -86,6 +91,8 @@ do-install:
${INSTALL_DATA} ${WRKDIR}/openoffice-linux-112-services.rdb \
${PREFIX}/OpenOffice.org${OO_VER}/program/services.rdb
${SH} -c "cd ${WRKSRC}; ./install --prefix=${PREFIX}"
+ ${INSTALL_LIB} ${DISTDIR}/libsot645li.so \
+ ${PREFIX}/OpenOffice.org${OO_VER}/program/libsot645li.so
${RM} -f ${PREFIX}/bin/soffice.orig
${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
< ${FILESDIR}/soffice > ${PREFIX}/bin/soffice
diff --git a/misc/openoffice-bin/distinfo b/misc/openoffice-bin/distinfo
index 69b23a6ef01..d1bae6d5a96 100644
--- a/misc/openoffice-bin/distinfo
+++ b/misc/openoffice-bin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/26 01:22:16 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2005/04/14 21:06:44 mrauch Exp $
SHA1 (OOo_1.1.4_LinuxIntel_install.tar.gz) = 769eada389dee1829a327ab791ec80d48da10422
RMD160 (OOo_1.1.4_LinuxIntel_install.tar.gz) = 6188beaa49d0998e011b24344333076b6f27e40a
@@ -12,3 +12,6 @@ Size (OOo_1.1.4_SolarisSparc_install.tar.gz) = 90876883 bytes
SHA1 (openoffice-linux-112-services.rdb.bz2) = c2a538eff450a50221baa212226807d0efd6b12e
RMD160 (openoffice-linux-112-services.rdb.bz2) = 857b4ab16e9af2f58264953fdfde2e4bd1972d7b
Size (openoffice-linux-112-services.rdb.bz2) = 61919 bytes
+SHA1 (libsot645li.so) = 6c6b9995482da055c149c6c9870cc19efbf4bfc1
+RMD160 (libsot645li.so) = 3890f84fcdad6a245d1cdfaf980b884e5d0b8f90
+Size (libsot645li.so) = 305472 bytes