From 8da0e9b0e953ec2aec82b9c08cb2b41acc157c12 Mon Sep 17 00:00:00 2001
From: "Ryan P.C. McQuen" <ryan.q@linux.com>
Date: Mon, 5 Sep 2016 17:16:50 -0700
Subject: office/openoffice.org: Add security hotfix patch.

Signed-off-by: Ryan P.C. McQuen <ryan.q@linux.com>
---
 office/openoffice.org/openoffice.org.SlackBuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'office/openoffice.org/openoffice.org.SlackBuild')

diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index 1ecb73fb47..87677a7676 100644
--- a/office/openoffice.org/openoffice.org.SlackBuild
+++ b/office/openoffice.org/openoffice.org.SlackBuild
@@ -28,13 +28,13 @@
 PRGNAM=openoffice.org
 SRCNAM=openoffice
 VERSION=${VERSION:-4.1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 SRCSHORT=$(echo $VERSION | cut -f1 -d.)
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -80,8 +80,8 @@ mkdir -p $PKG/usr/bin/
 mkdir -p $PKG/usr/share/applications/
 rm -rf $TMP/$SOURCEDIR
 
-# Extract tarball
 tar xvf $CWD/$TARNAME -C $TMP
+unzip -f $CWD/apache-${SRCNAM}-${VERSION}-patch1-apply-Linux`getconf LONG_BIT`.zip libtl.so -d $TMP
 
 cd $TMP/$SOURCEDIR/RPMS
 chown -R root:root .
@@ -99,11 +99,10 @@ for FILE in *.rpm ; do rpm2cpio < $FILE | cpio -imdv ; done
 
 rm -rf desktop-integration *.rpm
 mv opt $PKG
+## Apply security patch:
+mv $TMP/libtl.so $PKG/opt/${SRCNAM}${SRCSHORT}/program/libtl.so
 cd $PKG
 
-## Remove DejaVu fonts - these are included in other packages
-#rm -f $PKG/opt/${SRCNAM}${SRCSHORT}/share/fonts/truetype/DejaVu*.ttf
-
 ## Create symlinks in /usr/bin to actual binaries
 cd $PKG/usr/bin/
   for FILE in \
-- 
cgit v1.2.3