summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz@pkgsrc.org>2008-06-19 20:13:18 +0000
committerspz <spz@pkgsrc.org>2008-06-19 20:13:18 +0000
commitd8dcfec400af93d55d37d7f574bc3b602570c2f0 (patch)
tree88dc1ba3479d96bbf8303a4ed790c9eb270101d4
parent4e1064fb9a0d93f28df7415c8961fe1f75ce681c (diff)
downloadpkgsrc-d8dcfec400af93d55d37d7f574bc3b602570c2f0.tar.gz
Pullup ticket 2428 - requested by tron
Security fix Revisions pulled up: - pkgsrc/misc/openoffice2-bin/Makefile 1.36 - pkgsrc/misc/openoffice2-bin/distinfo 1.15 Module Name: pkgsrc Committed By: tron Date: Sun Jun 15 12:22:52 UTC 2008 Modified Files: pkgsrc/misc/openoffice2-bin: Makefile distinfo Log Message: Update "openoffice2-bin" package to version 2.4.1. This version fixes various bugs including the security vulnerability reported in CVE-2008-2152. To generate a diff of this commit: cvs rdiff -r1.35 -r1.36 pkgsrc/misc/openoffice2-bin/Makefile cvs rdiff -r1.14 -r1.15 pkgsrc/misc/openoffice2-bin/distinfo
-rw-r--r--misc/openoffice2-bin/Makefile6
-rw-r--r--misc/openoffice2-bin/distinfo8
2 files changed, 7 insertions, 7 deletions
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index 89d83a4abfc..c4ecabde2bb 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34.4.1 2008/04/22 14:29:56 rtr Exp $
+# $NetBSD: Makefile,v 1.34.4.2 2008/06/19 20:13:18 spz Exp $
DISTNAME= openoffice2-bin # overridden below
PKGNAME= openoffice2-bin-${OO_RELEASE}
@@ -16,7 +16,7 @@ CONFLICTS+= openoffice2-[0-9]*
CONFLICTS+= openoffice-linux-[0-9]*
OO_VER= 2.4
-OO_RELEASE= 2.4.0
+OO_RELEASE= 2.4.1
PLIST_SUBST+= VER=${OO_VER:Q}
MESSAGE_SUBST+= VER=${OO_VER:Q}
FILES_SUBST+= VER=${OO_VER:Q}
@@ -44,7 +44,7 @@ RUN_LDCONFIG= no
.if ${EMUL_PLATFORM} == "linux-i386"
DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC= ${WRKDIR}/OOH680_m12_native_packed-1_en-US.9286
+WRKSRC= ${WRKDIR}/OOH680_m17_native_packed-1_en-US.9310
.elif ${EMUL_PLATFORM} == "solaris-i386"
DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US
WRKSRC= ${WRKDIR}/OOG680_m5_native_packed-1_en-US.9221/packages
diff --git a/misc/openoffice2-bin/distinfo b/misc/openoffice2-bin/distinfo
index a68ebbbd907..e93aacf763d 100644
--- a/misc/openoffice2-bin/distinfo
+++ b/misc/openoffice2-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13.4.1 2008/04/22 14:29:57 rtr Exp $
+$NetBSD: distinfo,v 1.13.4.2 2008/06/19 20:13:18 spz Exp $
-SHA1 (OOo_2.4.0_LinuxIntel_install_en-US.tar.gz) = 21a33624852ac3a1449dbb53e972cc82549c455d
-RMD160 (OOo_2.4.0_LinuxIntel_install_en-US.tar.gz) = 495a017ba547600c450ace93288f5c6c9254f622
-Size (OOo_2.4.0_LinuxIntel_install_en-US.tar.gz) = 154268807 bytes
+SHA1 (OOo_2.4.1_LinuxIntel_install_en-US.tar.gz) = d12a4958e456230b3230471352e28727b4a52d87
+RMD160 (OOo_2.4.1_LinuxIntel_install_en-US.tar.gz) = d6128bb26d5ec22819e8ebc27cdd6e63f592a730
+Size (OOo_2.4.1_LinuxIntel_install_en-US.tar.gz) = 154297731 bytes