summaryrefslogtreecommitdiff
path: root/office
diff options
context:
space:
mode:
Diffstat (limited to 'office')
-rw-r--r--office/openoffice.org/openoffice.org.SlackBuild11
-rw-r--r--office/openoffice.org/openoffice.org.info12
2 files changed, 13 insertions, 10 deletions
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 \
diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info
index d2e4d1f3f2..f2d85dece8 100644
--- a/office/openoffice.org/openoffice.org.info
+++ b/office/openoffice.org/openoffice.org.info
@@ -1,10 +1,14 @@
PRGNAM="openoffice.org"
VERSION="4.1.2"
HOMEPAGE="https://openoffice.org"
-DOWNLOAD="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.2/binaries/en-US/Apache_OpenOffice_4.1.2_Linux_x86_install-rpm_en-US.tar.gz"
-MD5SUM="fb3a9d03b16b258c27e46d65d87b6512"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.2/binaries/en-US/Apache_OpenOffice_4.1.2_Linux_x86-64_install-rpm_en-US.tar.gz"
-MD5SUM_x86_64="bb3c58bec7d1280aae18bafe55e922ee"
+DOWNLOAD="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.2/binaries/en-US/Apache_OpenOffice_4.1.2_Linux_x86_install-rpm_en-US.tar.gz \
+ http://archive.apache.org/dist/openoffice/4.1.2-patch1/binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip"
+MD5SUM="fb3a9d03b16b258c27e46d65d87b6512 \
+ b87ad14e1f5ef732259901975826d247"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.2/binaries/en-US/Apache_OpenOffice_4.1.2_Linux_x86-64_install-rpm_en-US.tar.gz \
+ http://archive.apache.org/dist/openoffice/4.1.2-patch1/binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip"
+MD5SUM_x86_64="bb3c58bec7d1280aae18bafe55e922ee \
+ 0cc239e41fb78d8bf299c379ae4cbac9"
REQUIRES=""
MAINTAINER="Ryan P.C. McQuen"
EMAIL="ryan.q@linux.com"