Update to 3.4.3 based on wip/libreoffice3-bin

Due to security issue CVE-2011-2713.
http://www.libreoffice.org/advisories/CVE-2011-2713/

8 files changed, 44 insertions, 30 deletions

diff --git a/misc/libreoffice3-bin/Makefile b/misc/libreoffice3-bin/Makefile
index 5b36028475a..7a6d5d4b39f 100644
--- a/misc/libreoffice3-bin/Makefile
+++ b/misc/libreoffice3-bin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/10/06 12:42:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2011/10/07 13:28:54 ryoon Exp $
 
 DISTNAME=		libreoffice3-bin	# overridden below
 PKGNAME=		libreoffice3-bin-${OO_RELEASE}
 CATEGORIES=		misc
-MASTER_SITES=		http://download.documentfoundation.org/libreoffice/stable/3.3.4/rpm/x86/
+MASTER_SITES=		http://download.documentfoundation.org/libreoffice/stable/3.4.3/rpm/x86/
 
 MAINTAINER=		ryoon@NetBSD.org
 HOMEPAGE=		http://www.libreoffice.org/
@@ -20,8 +20,8 @@ CONFLICTS+=		openoffice3-bin-[0-9]*
 CONFLICTS+=		openoffice-linux-[0-9]*
 
 OO_VER=			3
-OO_BASEVER=		3.3
-OO_RELEASE=		3.3.4
+OO_BASEVER=		3.4
+OO_RELEASE=		3.4.3
 PLIST_SUBST+=		VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q}
 MESSAGE_SUBST+=		VER=${OO_VER:Q}
 FILES_SUBST+=		VER=${OO_VER:Q}
@@ -48,13 +48,18 @@ RUN_LDCONFIG=		no
 
 USE_TOOLS+=	patch
 
+BUILD_DEPENDS+=	binpatch-[0-9]*:../../pkgtools/binpatch
+
+FIND_PREFIX:=	BINPATCHDIR=binpatch
+.include "../../mk/find-prefix.mk"
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${EMUL_PLATFORM} == "linux-i386"
-DISTNAME=		LibO_3.3.4_Linux_x86_install-rpm_en-US
-WRKSRC=			${WRKDIR}/LibO_${OO_RELEASE}rc1_Linux_x86_install-rpm_en-US
+DISTNAME=		LibO_${OO_RELEASE}_Linux_x86_install-rpm_en-US
+WRKSRC=			${WRKDIR}/LibO_${OO_RELEASE}rc2_Linux_x86_install-rpm_en-US
 .elif ${EMUL_PLATFORM} == "solaris-i386"
 DISTNAME=		OOo_${OO_RELEASE}_Solaris_x86_install_en-US
 WRKSRC=			${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
@@ -68,19 +73,24 @@ WRKSRC=			${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
 INSTALLATION_DIRS= bin
 
 do-install:
-	${PATCH} -d ${DESTDIR}${PREFIX}/opt/libreoffice/program < ${FILESDIR}/soffice-patch
-	${RM} -f ${DESTDIR}${PREFIX}/opt/libreoffice/program/soffice.orig
-	${PATCH} -d ${DESTDIR}${PREFIX}/opt/libreoffice/program < ${FILESDIR}/spadmin-patch
-	${RM} -f ${DESTDIR}${PREFIX}/opt/libreoffice/program/spadmin.orig
+#	${PATCH} -d ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program < ${FILESDIR}/soffice-patch
+#	${RM} -f ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program/soffice.orig
+	${PATCH} -d ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program < ${FILESDIR}/spadmin-patch
+	${RM} -f ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program/spadmin.orig
 	uniq ${RPM2PKG_PLIST} | \
 		${SED} -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST
 	${RM} -f ${DESTDIR}${PREFIX}/bin/soffice
 	${SED}  -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
 		-e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
+		-e "s|@@OO_BASEVER@@|${OO_BASEVER}|g" \
 		< ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice
 	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice
 .for i in scalc sdraw simpress smath spadmin swriter
-	${LN} -sf ../opt/libreoffice/program/${i} ${DESTDIR}${PREFIX}/bin/${i}
+	${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i}
 .endfor
 
+post-install:
+	${CHMOD} 755 ${DESTDIR}${PREFIX}/opt/libreoffice3.4/program/oosplash.bin
+	${BINPATCHDIR}/bin/binpatch file=${DESTDIR}${PREFIX}/opt/libreoffice3.4/program/oosplash.bin size=19084 offset=16442 compare=76657273696F6E00 skip=0 replace=637075696E666f
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/libreoffice3-bin/PLIST.dirs b/misc/libreoffice3-bin/PLIST.dirs
index 3c12ecf9257..1d4d1e6a629 100644
--- a/misc/libreoffice3-bin/PLIST.dirs
+++ b/misc/libreoffice3-bin/PLIST.dirs
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.dirs,v 1.1.1.1 2011/06/12 09:05:30 ryoon Exp $
+@comment $NetBSD: PLIST.dirs,v 1.2 2011/10/07 13:28:54 ryoon Exp $
 @pkgdir opt/libreoffice
 @pkgdir opt
diff --git a/misc/libreoffice3-bin/PLIST.proglinks b/misc/libreoffice3-bin/PLIST.proglinks
index 89ae76da2c8..ffa475f6421 100644
--- a/misc/libreoffice3-bin/PLIST.proglinks
+++ b/misc/libreoffice3-bin/PLIST.proglinks
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.proglinks,v 1.1.1.1 2011/06/12 09:05:30 ryoon Exp $
+@comment $NetBSD: PLIST.proglinks,v 1.2 2011/10/07 13:28:54 ryoon Exp $
 bin/scalc
 bin/sdraw
 bin/simpress
diff --git a/misc/libreoffice3-bin/distinfo b/misc/libreoffice3-bin/distinfo
index c1c327adef2..73f2b0993fc 100644
--- a/misc/libreoffice3-bin/distinfo
+++ b/misc/libreoffice3-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2011/10/06 12:42:26 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2011/10/07 13:28:54 ryoon Exp $
 
-SHA1 (LibO_3.3.4_Linux_x86_install-rpm_en-US.tar.gz) = 5f0eeb67797764a8a9c306cdf74ccd2ff6b3912c
-RMD160 (LibO_3.3.4_Linux_x86_install-rpm_en-US.tar.gz) = ec7fd0cdfd7bb316ef1ce1122130aa5f46ad946a
-Size (LibO_3.3.4_Linux_x86_install-rpm_en-US.tar.gz) = 153719935 bytes
+SHA1 (LibO_3.4.3_Linux_x86_install-rpm_en-US.tar.gz) = afb281927057b8b3a708291c12013512b816fcdc
+RMD160 (LibO_3.4.3_Linux_x86_install-rpm_en-US.tar.gz) = 9997288695e57281b518bce94f84b4483c71a07b
+Size (LibO_3.4.3_Linux_x86_install-rpm_en-US.tar.gz) = 153607902 bytes
diff --git a/misc/libreoffice3-bin/files/soffice b/misc/libreoffice3-bin/files/soffice
index 984d7a990ca..bd5b510c056 100644
--- a/misc/libreoffice3-bin/files/soffice
+++ b/misc/libreoffice3-bin/files/soffice
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-#	$NetBSD: soffice,v 1.1.1.1 2011/06/12 09:05:30 ryoon Exp $
+#	$NetBSD: soffice,v 1.2 2011/10/07 13:28:54 ryoon Exp $
 #
-SOINST=@@PREFIX@@/opt/libreoffice
+SOINST=@@PREFIX@@/opt/libreoffice@@OO_BASEVER@@
 
 # make sure we can find `whoami` on solaris
 PATH=${PATH}:/usr/ucb
diff --git a/misc/libreoffice3-bin/files/soffice-patch b/misc/libreoffice3-bin/files/soffice-patch
index 195a35e050b..a6bcdbd3ea2 100644
--- a/misc/libreoffice3-bin/files/soffice-patch
+++ b/misc/libreoffice3-bin/files/soffice-patch
@@ -1,10 +1,12 @@
-$NetBSD: soffice-patch,v 1.2 2011/06/19 06:12:27 ryoon Exp $
+#
+# $NetBSD: soffice-patch,v 1.3 2011/10/07 13:28:54 ryoon Exp $
+#
 
---- /usr/tmp/misc/libreoffice3-bin/work/.destdir/usr/pkg/opt/libreoffice/program/soffice.orig	2011-06-19 05:55:59.000000000 +0000
-+++ /usr/tmp/misc/libreoffice3-bin/work/.destdir/usr/pkg/opt/libreoffice/program/soffice
-@@ -129,6 +129,10 @@ done
- "$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
-     ${sd_pagein_args}
+--- soffice.orig	2009-01-18 23:49:18.000000000 +0100
++++ soffice	2009-01-19 00:10:22.000000000 +0100
+@@ -73,6 +73,10 @@
+   esac
+ done
  
 +# Set LD_LIBRARY_PATH so that javaldx finds libuno_sal.so.3:
 +LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/../ure/lib${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
diff --git a/misc/libreoffice3-bin/files/spadmin-patch b/misc/libreoffice3-bin/files/spadmin-patch
index d37062af3f9..1daae78b82c 100644
--- a/misc/libreoffice3-bin/files/spadmin-patch
+++ b/misc/libreoffice3-bin/files/spadmin-patch
@@ -1,8 +1,10 @@
-$NetBSD: spadmin-patch,v 1.2 2011/06/19 06:12:27 ryoon Exp $
+#
+# $NetBSD: spadmin-patch,v 1.3 2011/10/07 13:28:54 ryoon Exp $
+#
 
---- /usr/tmp/misc/libreoffice3-bin/work/.destdir/usr/pkg/opt/libreoffice/program/spadmin.orig	2011-06-19 05:55:59.000000000 +0000
-+++ /usr/tmp/misc/libreoffice3-bin/work/.destdir/usr/pkg/opt/libreoffice/program/spadmin
-@@ -52,6 +52,10 @@ do
+--- spadmin.orig	2009-10-08 12:21:04.000000000 +0200
++++ spadmin	2009-10-08 12:22:22.000000000 +0200
+@@ -56,6 +56,10 @@
    esac
  done
  
diff --git a/misc/libreoffice3-bin/options.mk b/misc/libreoffice3-bin/options.mk
index 28c53bcabd8..bc2d936aae7 100644
--- a/misc/libreoffice3-bin/options.mk
+++ b/misc/libreoffice3-bin/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/06/12 09:05:30 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2011/10/07 13:28:54 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice-bin
 PKG_SUPPORTED_OPTIONS=	java