* [PR PATCH] Wps office
@ 2023-12-29 12:53 mobinmob
2023-12-29 15:48 ` [PR PATCH] [Updated] " mobinmob
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: mobinmob @ 2023-12-29 12:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1350 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages wps-office
https://github.com/void-linux/void-packages/pull/47971
Wps office
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This PR introduces tiff5, and upgrades wps-office.
It fixes https://github.com/void-linux/void-packages/issues/44335 .
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47971.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wps-office-47971.patch --]
[-- Type: text/x-diff, Size: 13702 bytes --]
From 04f253fccbcd24ff3cb2dd2300cc0733e35bf86b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 29 Dec 2023 14:49:27 +0200
Subject: [PATCH 1/2] New package: tiff5-4.4.0
---
common/shlibs | 2 +
srcpkgs/tiff5-devel | 1 +
.../libtiff5-4.4.0-CVE-2022-34526.patch | 28 +++
.../patches/libtiff5-4.4.0-fpe_tiffcrop.patch | 180 ++++++++++++++++++
srcpkgs/tiff5/template | 35 ++++
5 files changed, 246 insertions(+)
create mode 120000 srcpkgs/tiff5-devel
create mode 100644 srcpkgs/tiff5/patches/libtiff5-4.4.0-CVE-2022-34526.patch
create mode 100644 srcpkgs/tiff5/patches/libtiff5-4.4.0-fpe_tiffcrop.patch
create mode 100644 srcpkgs/tiff5/template
diff --git a/common/shlibs b/common/shlibs
index 6463e020bb473..cbf7e4f4e693b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -316,6 +316,8 @@ libxcb-event.so.1 xcb-util-0.3.4_1
libxcb-util.so.1 xcb-util-0.3.9_1
libtiff.so.6 tiff-4.5.0_1
libtiffxx.so.6 tiff-4.5.0_1
+libtiff.so.5 tiff5-4.4.0_1
+libtiffxx.so.5 tiff5-4.4.0_1
libnotify.so.4 libnotify-0.7_1
libexo-1.so.0 exo-0.7.3_1
libexo-2.so.0 exo-0.12.0_1
diff --git a/srcpkgs/tiff5-devel b/srcpkgs/tiff5-devel
new file mode 120000
index 0000000000000..6ebded452c70c
--- /dev/null
+++ b/srcpkgs/tiff5-devel
@@ -0,0 +1 @@
+tiff5
\ No newline at end of file
diff --git a/srcpkgs/tiff5/patches/libtiff5-4.4.0-CVE-2022-34526.patch b/srcpkgs/tiff5/patches/libtiff5-4.4.0-CVE-2022-34526.patch
new file mode 100644
index 0000000000000..cb3a4d3c77e2c
--- /dev/null
+++ b/srcpkgs/tiff5/patches/libtiff5-4.4.0-CVE-2022-34526.patch
@@ -0,0 +1,28 @@
+From 275735d0354e39c0ac1dc3c0db2120d6f31d1990 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 27 Jun 2022 16:09:43 +0200
+Subject: [PATCH] _TIFFCheckFieldIsValidForCodec(): return FALSE when passed a
+ codec-specific tag and the codec is not configured (fixes #433)
+
+This avoids crashes when querying such tags
+---
+ libtiff/tif_dirinfo.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
+index c30f569b..3371cb5c 100644
+--- a/libtiff/tif_dirinfo.c
++++ b/libtiff/tif_dirinfo.c
+@@ -1191,6 +1191,9 @@ _TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag)
+ default:
+ return 1;
+ }
++ if( !TIFFIsCODECConfigured(tif->tif_dir.td_compression) ) {
++ return 0;
++ }
+ /* Check if codec specific tags are allowed for the current
+ * compression scheme (codec) */
+ switch (tif->tif_dir.td_compression) {
+--
+GitLab
+
diff --git a/srcpkgs/tiff5/patches/libtiff5-4.4.0-fpe_tiffcrop.patch b/srcpkgs/tiff5/patches/libtiff5-4.4.0-fpe_tiffcrop.patch
new file mode 100644
index 0000000000000..f62a41ad7471c
--- /dev/null
+++ b/srcpkgs/tiff5/patches/libtiff5-4.4.0-fpe_tiffcrop.patch
@@ -0,0 +1,180 @@
+From dd1bcc7abb26094e93636e85520f0d8f81ab0fab Mon Sep 17 00:00:00 2001
+From: 4ugustus <wangdw.augustus@qq.com>
+Date: Sat, 11 Jun 2022 09:31:43 +0000
+Subject: [PATCH] fix the FPE in tiffcrop (#415, #427, and #428)
+
+---
+ libtiff/tif_aux.c | 9 +++++++
+ libtiff/tiffiop.h | 1 +
+ tools/tiffcrop.c | 62 ++++++++++++++++++++++++++---------------------
+ 3 files changed, 44 insertions(+), 28 deletions(-)
+
+diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c
+index 140f26c7..5b88c8d0 100644
+--- a/libtiff/tif_aux.c
++++ b/libtiff/tif_aux.c
+@@ -402,6 +402,15 @@ float _TIFFClampDoubleToFloat( double val )
+ return (float)val;
+ }
+
++uint32_t _TIFFClampDoubleToUInt32(double val)
++{
++ if( val < 0 )
++ return 0;
++ if( val > 0xFFFFFFFFU || val != val )
++ return 0xFFFFFFFFU;
++ return (uint32_t)val;
++}
++
+ int _TIFFSeekOK(TIFF* tif, toff_t off)
+ {
+ /* Huge offsets, especially -1 / UINT64_MAX, can cause issues */
+diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
+index e3af461d..4e8bdac2 100644
+--- a/libtiff/tiffiop.h
++++ b/libtiff/tiffiop.h
+@@ -365,6 +365,7 @@ extern double _TIFFUInt64ToDouble(uint64_t);
+ extern float _TIFFUInt64ToFloat(uint64_t);
+
+ extern float _TIFFClampDoubleToFloat(double);
++extern uint32_t _TIFFClampDoubleToUInt32(double);
+
+ extern tmsize_t
+ _TIFFReadEncodedStripAndAllocBuffer(TIFF* tif, uint32_t strip,
+diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
+index 1f827b2b..90286a5e 100644
+--- a/tools/tiffcrop.c
++++ b/tools/tiffcrop.c
+@@ -5268,17 +5268,17 @@ computeInputPixelOffsets(struct crop_mask *crop, struct image_data *image,
+ {
+ if ((crop->res_unit == RESUNIT_INCH) || (crop->res_unit == RESUNIT_CENTIMETER))
+ {
+- x1 = (uint32_t) (crop->corners[i].X1 * scale * xres);
+- x2 = (uint32_t) (crop->corners[i].X2 * scale * xres);
+- y1 = (uint32_t) (crop->corners[i].Y1 * scale * yres);
+- y2 = (uint32_t) (crop->corners[i].Y2 * scale * yres);
++ x1 = _TIFFClampDoubleToUInt32(crop->corners[i].X1 * scale * xres);
++ x2 = _TIFFClampDoubleToUInt32(crop->corners[i].X2 * scale * xres);
++ y1 = _TIFFClampDoubleToUInt32(crop->corners[i].Y1 * scale * yres);
++ y2 = _TIFFClampDoubleToUInt32(crop->corners[i].Y2 * scale * yres);
+ }
+ else
+ {
+- x1 = (uint32_t) (crop->corners[i].X1);
+- x2 = (uint32_t) (crop->corners[i].X2);
+- y1 = (uint32_t) (crop->corners[i].Y1);
+- y2 = (uint32_t) (crop->corners[i].Y2);
++ x1 = _TIFFClampDoubleToUInt32(crop->corners[i].X1);
++ x2 = _TIFFClampDoubleToUInt32(crop->corners[i].X2);
++ y1 = _TIFFClampDoubleToUInt32(crop->corners[i].Y1);
++ y2 = _TIFFClampDoubleToUInt32(crop->corners[i].Y2);
+ }
+ /* a) Region needs to be within image sizes 0.. width-1; 0..length-1
+ * b) Corners are expected to be submitted as top-left to bottom-right.
+@@ -5357,17 +5357,17 @@ computeInputPixelOffsets(struct crop_mask *crop, struct image_data *image,
+ {
+ if (crop->res_unit != RESUNIT_INCH && crop->res_unit != RESUNIT_CENTIMETER)
+ { /* User has specified pixels as reference unit */
+- tmargin = (uint32_t)(crop->margins[0]);
+- lmargin = (uint32_t)(crop->margins[1]);
+- bmargin = (uint32_t)(crop->margins[2]);
+- rmargin = (uint32_t)(crop->margins[3]);
++ tmargin = _TIFFClampDoubleToUInt32(crop->margins[0]);
++ lmargin = _TIFFClampDoubleToUInt32(crop->margins[1]);
++ bmargin = _TIFFClampDoubleToUInt32(crop->margins[2]);
++ rmargin = _TIFFClampDoubleToUInt32(crop->margins[3]);
+ }
+ else
+ { /* inches or centimeters specified */
+- tmargin = (uint32_t)(crop->margins[0] * scale * yres);
+- lmargin = (uint32_t)(crop->margins[1] * scale * xres);
+- bmargin = (uint32_t)(crop->margins[2] * scale * yres);
+- rmargin = (uint32_t)(crop->margins[3] * scale * xres);
++ tmargin = _TIFFClampDoubleToUInt32(crop->margins[0] * scale * yres);
++ lmargin = _TIFFClampDoubleToUInt32(crop->margins[1] * scale * xres);
++ bmargin = _TIFFClampDoubleToUInt32(crop->margins[2] * scale * yres);
++ rmargin = _TIFFClampDoubleToUInt32(crop->margins[3] * scale * xres);
+ }
+
+ if ((lmargin + rmargin) > image->width)
+@@ -5397,24 +5397,24 @@ computeInputPixelOffsets(struct crop_mask *crop, struct image_data *image,
+ if (crop->res_unit != RESUNIT_INCH && crop->res_unit != RESUNIT_CENTIMETER)
+ {
+ if (crop->crop_mode & CROP_WIDTH)
+- width = (uint32_t)crop->width;
++ width = _TIFFClampDoubleToUInt32(crop->width);
+ else
+ width = image->width - lmargin - rmargin;
+
+ if (crop->crop_mode & CROP_LENGTH)
+- length = (uint32_t)crop->length;
++ length = _TIFFClampDoubleToUInt32(crop->length);
+ else
+ length = image->length - tmargin - bmargin;
+ }
+ else
+ {
+ if (crop->crop_mode & CROP_WIDTH)
+- width = (uint32_t)(crop->width * scale * image->xres);
++ width = _TIFFClampDoubleToUInt32(crop->width * scale * image->xres);
+ else
+ width = image->width - lmargin - rmargin;
+
+ if (crop->crop_mode & CROP_LENGTH)
+- length = (uint32_t)(crop->length * scale * image->yres);
++ length = _TIFFClampDoubleToUInt32(crop->length * scale * image->yres);
+ else
+ length = image->length - tmargin - bmargin;
+ }
+@@ -5868,13 +5868,13 @@ computeOutputPixelOffsets (struct crop_mask *crop, struct image_data *image,
+ {
+ if (page->res_unit == RESUNIT_INCH || page->res_unit == RESUNIT_CENTIMETER)
+ { /* inches or centimeters specified */
+- hmargin = (uint32_t)(page->hmargin * scale * page->hres * ((image->bps + 7) / 8));
+- vmargin = (uint32_t)(page->vmargin * scale * page->vres * ((image->bps + 7) / 8));
++ hmargin = _TIFFClampDoubleToUInt32(page->hmargin * scale * page->hres * ((image->bps + 7) / 8));
++ vmargin = _TIFFClampDoubleToUInt32(page->vmargin * scale * page->vres * ((image->bps + 7) / 8));
+ }
+ else
+ { /* Otherwise user has specified pixels as reference unit */
+- hmargin = (uint32_t)(page->hmargin * scale * ((image->bps + 7) / 8));
+- vmargin = (uint32_t)(page->vmargin * scale * ((image->bps + 7) / 8));
++ hmargin = _TIFFClampDoubleToUInt32(page->hmargin * scale * ((image->bps + 7) / 8));
++ vmargin = _TIFFClampDoubleToUInt32(page->vmargin * scale * ((image->bps + 7) / 8));
+ }
+
+ if ((hmargin * 2.0) > (pwidth * page->hres))
+@@ -5912,13 +5912,13 @@ computeOutputPixelOffsets (struct crop_mask *crop, struct image_data *image,
+ {
+ if (page->mode & PAGE_MODE_PAPERSIZE )
+ {
+- owidth = (uint32_t)((pwidth * page->hres) - (hmargin * 2));
+- olength = (uint32_t)((plength * page->vres) - (vmargin * 2));
++ owidth = _TIFFClampDoubleToUInt32((pwidth * page->hres) - (hmargin * 2));
++ olength = _TIFFClampDoubleToUInt32((plength * page->vres) - (vmargin * 2));
+ }
+ else
+ {
+- owidth = (uint32_t)(iwidth - (hmargin * 2 * page->hres));
+- olength = (uint32_t)(ilength - (vmargin * 2 * page->vres));
++ owidth = _TIFFClampDoubleToUInt32(iwidth - (hmargin * 2 * page->hres));
++ olength = _TIFFClampDoubleToUInt32(ilength - (vmargin * 2 * page->vres));
+ }
+ }
+
+@@ -5927,6 +5927,12 @@ computeOutputPixelOffsets (struct crop_mask *crop, struct image_data *image,
+ if (olength > ilength)
+ olength = ilength;
+
++ if (owidth == 0 || olength == 0)
++ {
++ TIFFError("computeOutputPixelOffsets", "Integer overflow when calculating the number of pages");
++ exit(EXIT_FAILURE);
++ }
++
+ /* Compute the number of pages required for Portrait or Landscape */
+ switch (page->orient)
+ {
+--
+GitLab
+
diff --git a/srcpkgs/tiff5/template b/srcpkgs/tiff5/template
new file mode 100644
index 0000000000000..d8785fcafd594
--- /dev/null
+++ b/srcpkgs/tiff5/template
@@ -0,0 +1,35 @@
+# Template file for 'tiff5'
+pkgname=tiff5
+version=4.4.0
+revision=1
+build_style=gnu-configure
+configure_args="--enable-cxx --without-x"
+makedepends="jbigkit-devel libjpeg-turbo-devel
+ liblzma-devel libzstd-devel zlib-devel"
+short_desc="Library and tools for reading and writing TIFF data files"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="custom:libtiff"
+homepage="http://www.simplesystems.org/libtiff/"
+distfiles="https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
+checksum=917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed
+
+post_install() {
+ for f in ${DESTDIR}/usr/share/man/man3/*.3tiff; do
+ mv ${f} ${f%tiff}
+ done
+ vlicense COPYRIGHT
+}
+
+tiff5-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ conflicts="tiff-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/man/man3
+ vmove usr/share/doc
+ }
+}
From 6f30819babed164eba1fcf4103aa6885727fce91 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 29 Dec 2023 14:49:37 +0200
Subject: [PATCH 2/2] wps-office: update to 11.1.0.11711.
---
srcpkgs/wps-office/template | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 0f0d223fa812b..43c0f3d458e29 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,7 +1,7 @@
# Template file for 'wps-office'
pkgname=wps-office
-version=11.1.0.10920
-revision=2
+version=11.1.0.11711
+revision=1
archs="x86_64"
short_desc="Linux office suite with similar appearance to MS Office"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -12,8 +12,8 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:EULA"
homepage="http://wps-community.org"
changelog="https://www.wps.com/whatsnew/linux/"
-checksum=e252ac96473291df1e9dbeff2d1aedd1299f5ef411fa012ad617cfcd47dc3462
-# allow_unknown_shlibs=yes
+checksum=119a643c42d4b2fdc8e377f1a7625c31820ff11488c20b67a94c8ac662541d1a
+allow_unknown_shlibs=yes
nodebug=yes
nostrip=yes
restricted=yes
@@ -24,7 +24,7 @@ repository=nonfree
# The programs themselves are PIE, but the error reporter isn't :/
nopie=yes
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10920
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${version##*.}
_distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
distfiles="${_disturl}/${_distTar}"
@@ -57,4 +57,8 @@ post_install() {
rm -f ${DESTDIR}/opt/kingsoft/wps-office/office6/librpc{et,wps,wpp}api.so
# systemd
rm -f ${DESTDIR}/opt/kingsoft/wps-office/office6/libdbus-1.so*
+
+ # stdlibc++
+ rm -f ${DESTDIR}/opt/kingsoft/wps-office/office6/libstdc++.so.6
+ rm -f ${DESTDIR}/opt/kingsoft/wps-office/office6/libstdc++.so.6.0.28
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Wps office
2023-12-29 12:53 [PR PATCH] Wps office mobinmob
@ 2023-12-29 15:48 ` mobinmob
2023-12-29 15:51 ` mobinmob
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: mobinmob @ 2023-12-29 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages wps-office
https://github.com/void-linux/void-packages/pull/47971
Wps office
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This PR introduces tiff5, and upgrades wps-office.
It fixes https://github.com/void-linux/void-packages/issues/44335 .
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47971.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wps-office-47971.patch --]
[-- Type: text/x-diff, Size: 13810 bytes --]
From b9aca5c93653548e3c9c687ed3a4c96fe158d232 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 29 Dec 2023 17:48:14 +0200
Subject: [PATCH 1/2] New package: tiff5-4.4.0
---
common/shlibs | 2 +
srcpkgs/tiff5-devel | 1 +
.../libtiff5-4.4.0-CVE-2022-34526.patch | 28 +++
.../patches/libtiff5-4.4.0-fpe_tiffcrop.patch | 180 ++++++++++++++++++
srcpkgs/tiff5/template | 38 ++++
5 files changed, 249 insertions(+)
create mode 120000 srcpkgs/tiff5-devel
create mode 100644 srcpkgs/tiff5/patches/libtiff5-4.4.0-CVE-2022-34526.patch
create mode 100644 srcpkgs/tiff5/patches/libtiff5-4.4.0-fpe_tiffcrop.patch
create mode 100644 srcpkgs/tiff5/template
diff --git a/common/shlibs b/common/shlibs
index 6463e020bb473..cbf7e4f4e693b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -316,6 +316,8 @@ libxcb-event.so.1 xcb-util-0.3.4_1
libxcb-util.so.1 xcb-util-0.3.9_1
libtiff.so.6 tiff-4.5.0_1
libtiffxx.so.6 tiff-4.5.0_1
+libtiff.so.5 tiff5-4.4.0_1
+libtiffxx.so.5 tiff5-4.4.0_1
libnotify.so.4 libnotify-0.7_1
libexo-1.so.0 exo-0.7.3_1
libexo-2.so.0 exo-0.12.0_1
diff --git a/srcpkgs/tiff5-devel b/srcpkgs/tiff5-devel
new file mode 120000
index 0000000000000..6ebded452c70c
--- /dev/null
+++ b/srcpkgs/tiff5-devel
@@ -0,0 +1 @@
+tiff5
\ No newline at end of file
diff --git a/srcpkgs/tiff5/patches/libtiff5-4.4.0-CVE-2022-34526.patch b/srcpkgs/tiff5/patches/libtiff5-4.4.0-CVE-2022-34526.patch
new file mode 100644
index 0000000000000..cb3a4d3c77e2c
--- /dev/null
+++ b/srcpkgs/tiff5/patches/libtiff5-4.4.0-CVE-2022-34526.patch
@@ -0,0 +1,28 @@
+From 275735d0354e39c0ac1dc3c0db2120d6f31d1990 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 27 Jun 2022 16:09:43 +0200
+Subject: [PATCH] _TIFFCheckFieldIsValidForCodec(): return FALSE when passed a
+ codec-specific tag and the codec is not configured (fixes #433)
+
+This avoids crashes when querying such tags
+---
+ libtiff/tif_dirinfo.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
+index c30f569b..3371cb5c 100644
+--- a/libtiff/tif_dirinfo.c
++++ b/libtiff/tif_dirinfo.c
+@@ -1191,6 +1191,9 @@ _TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag)
+ default:
+ return 1;
+ }
++ if( !TIFFIsCODECConfigured(tif->tif_dir.td_compression) ) {
++ return 0;
++ }
+ /* Check if codec specific tags are allowed for the current
+ * compression scheme (codec) */
+ switch (tif->tif_dir.td_compression) {
+--
+GitLab
+
diff --git a/srcpkgs/tiff5/patches/libtiff5-4.4.0-fpe_tiffcrop.patch b/srcpkgs/tiff5/patches/libtiff5-4.4.0-fpe_tiffcrop.patch
new file mode 100644
index 0000000000000..f62a41ad7471c
--- /dev/null
+++ b/srcpkgs/tiff5/patches/libtiff5-4.4.0-fpe_tiffcrop.patch
@@ -0,0 +1,180 @@
+From dd1bcc7abb26094e93636e85520f0d8f81ab0fab Mon Sep 17 00:00:00 2001
+From: 4ugustus <wangdw.augustus@qq.com>
+Date: Sat, 11 Jun 2022 09:31:43 +0000
+Subject: [PATCH] fix the FPE in tiffcrop (#415, #427, and #428)
+
+---
+ libtiff/tif_aux.c | 9 +++++++
+ libtiff/tiffiop.h | 1 +
+ tools/tiffcrop.c | 62 ++++++++++++++++++++++++++---------------------
+ 3 files changed, 44 insertions(+), 28 deletions(-)
+
+diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c
+index 140f26c7..5b88c8d0 100644
+--- a/libtiff/tif_aux.c
++++ b/libtiff/tif_aux.c
+@@ -402,6 +402,15 @@ float _TIFFClampDoubleToFloat( double val )
+ return (float)val;
+ }
+
++uint32_t _TIFFClampDoubleToUInt32(double val)
++{
++ if( val < 0 )
++ return 0;
++ if( val > 0xFFFFFFFFU || val != val )
++ return 0xFFFFFFFFU;
++ return (uint32_t)val;
++}
++
+ int _TIFFSeekOK(TIFF* tif, toff_t off)
+ {
+ /* Huge offsets, especially -1 / UINT64_MAX, can cause issues */
+diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
+index e3af461d..4e8bdac2 100644
+--- a/libtiff/tiffiop.h
++++ b/libtiff/tiffiop.h
+@@ -365,6 +365,7 @@ extern double _TIFFUInt64ToDouble(uint64_t);
+ extern float _TIFFUInt64ToFloat(uint64_t);
+
+ extern float _TIFFClampDoubleToFloat(double);
++extern uint32_t _TIFFClampDoubleToUInt32(double);
+
+ extern tmsize_t
+ _TIFFReadEncodedStripAndAllocBuffer(TIFF* tif, uint32_t strip,
+diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
+index 1f827b2b..90286a5e 100644
+--- a/tools/tiffcrop.c
++++ b/tools/tiffcrop.c
+@@ -5268,17 +5268,17 @@ computeInputPixelOffsets(struct crop_mask *crop, struct image_data *image,
+ {
+ if ((crop->res_unit == RESUNIT_INCH) || (crop->res_unit == RESUNIT_CENTIMETER))
+ {
+- x1 = (uint32_t) (crop->corners[i].X1 * scale * xres);
+- x2 = (uint32_t) (crop->corners[i].X2 * scale * xres);
+- y1 = (uint32_t) (crop->corners[i].Y1 * scale * yres);
+- y2 = (uint32_t) (crop->corners[i].Y2 * scale * yres);
++ x1 = _TIFFClampDoubleToUInt32(crop->corners[i].X1 * scale * xres);
++ x2 = _TIFFClampDoubleToUInt32(crop->corners[i].X2 * scale * xres);
++ y1 = _TIFFClampDoubleToUInt32(crop->corners[i].Y1 * scale * yres);
++ y2 = _TIFFClampDoubleToUInt32(crop->corners[i].Y2 * scale * yres);
+ }
+ else
+ {
+- x1 = (uint32_t) (crop->corners[i].X1);
+- x2 = (uint32_t) (crop->corners[i].X2);
+- y1 = (uint32_t) (crop->corners[i].Y1);
+- y2 = (uint32_t) (crop->corners[i].Y2);
++ x1 = _TIFFClampDoubleToUInt32(crop->corners[i].X1);
++ x2 = _TIFFClampDoubleToUInt32(crop->corners[i].X2);
++ y1 = _TIFFClampDoubleToUInt32(crop->corners[i].Y1);
++ y2 = _TIFFClampDoubleToUInt32(crop->corners[i].Y2);
+ }
+ /* a) Region needs to be within image sizes 0.. width-1; 0..length-1
+ * b) Corners are expected to be submitted as top-left to bottom-right.
+@@ -5357,17 +5357,17 @@ computeInputPixelOffsets(struct crop_mask *crop, struct image_data *image,
+ {
+ if (crop->res_unit != RESUNIT_INCH && crop->res_unit != RESUNIT_CENTIMETER)
+ { /* User has specified pixels as reference unit */
+- tmargin = (uint32_t)(crop->margins[0]);
+- lmargin = (uint32_t)(crop->margins[1]);
+- bmargin = (uint32_t)(crop->margins[2]);
+- rmargin = (uint32_t)(crop->margins[3]);
++ tmargin = _TIFFClampDoubleToUInt32(crop->margins[0]);
++ lmargin = _TIFFClampDoubleToUInt32(crop->margins[1]);
++ bmargin = _TIFFClampDoubleToUInt32(crop->margins[2]);
++ rmargin = _TIFFClampDoubleToUInt32(crop->margins[3]);
+ }
+ else
+ { /* inches or centimeters specified */
+- tmargin = (uint32_t)(crop->margins[0] * scale * yres);
+- lmargin = (uint32_t)(crop->margins[1] * scale * xres);
+- bmargin = (uint32_t)(crop->margins[2] * scale * yres);
+- rmargin = (uint32_t)(crop->margins[3] * scale * xres);
++ tmargin = _TIFFClampDoubleToUInt32(crop->margins[0] * scale * yres);
++ lmargin = _TIFFClampDoubleToUInt32(crop->margins[1] * scale * xres);
++ bmargin = _TIFFClampDoubleToUInt32(crop->margins[2] * scale * yres);
++ rmargin = _TIFFClampDoubleToUInt32(crop->margins[3] * scale * xres);
+ }
+
+ if ((lmargin + rmargin) > image->width)
+@@ -5397,24 +5397,24 @@ computeInputPixelOffsets(struct crop_mask *crop, struct image_data *image,
+ if (crop->res_unit != RESUNIT_INCH && crop->res_unit != RESUNIT_CENTIMETER)
+ {
+ if (crop->crop_mode & CROP_WIDTH)
+- width = (uint32_t)crop->width;
++ width = _TIFFClampDoubleToUInt32(crop->width);
+ else
+ width = image->width - lmargin - rmargin;
+
+ if (crop->crop_mode & CROP_LENGTH)
+- length = (uint32_t)crop->length;
++ length = _TIFFClampDoubleToUInt32(crop->length);
+ else
+ length = image->length - tmargin - bmargin;
+ }
+ else
+ {
+ if (crop->crop_mode & CROP_WIDTH)
+- width = (uint32_t)(crop->width * scale * image->xres);
++ width = _TIFFClampDoubleToUInt32(crop->width * scale * image->xres);
+ else
+ width = image->width - lmargin - rmargin;
+
+ if (crop->crop_mode & CROP_LENGTH)
+- length = (uint32_t)(crop->length * scale * image->yres);
++ length = _TIFFClampDoubleToUInt32(crop->length * scale * image->yres);
+ else
+ length = image->length - tmargin - bmargin;
+ }
+@@ -5868,13 +5868,13 @@ computeOutputPixelOffsets (struct crop_mask *crop, struct image_data *image,
+ {
+ if (page->res_unit == RESUNIT_INCH || page->res_unit == RESUNIT_CENTIMETER)
+ { /* inches or centimeters specified */
+- hmargin = (uint32_t)(page->hmargin * scale * page->hres * ((image->bps + 7) / 8));
+- vmargin = (uint32_t)(page->vmargin * scale * page->vres * ((image->bps + 7) / 8));
++ hmargin = _TIFFClampDoubleToUInt32(page->hmargin * scale * page->hres * ((image->bps + 7) / 8));
++ vmargin = _TIFFClampDoubleToUInt32(page->vmargin * scale * page->vres * ((image->bps + 7) / 8));
+ }
+ else
+ { /* Otherwise user has specified pixels as reference unit */
+- hmargin = (uint32_t)(page->hmargin * scale * ((image->bps + 7) / 8));
+- vmargin = (uint32_t)(page->vmargin * scale * ((image->bps + 7) / 8));
++ hmargin = _TIFFClampDoubleToUInt32(page->hmargin * scale * ((image->bps + 7) / 8));
++ vmargin = _TIFFClampDoubleToUInt32(page->vmargin * scale * ((image->bps + 7) / 8));
+ }
+
+ if ((hmargin * 2.0) > (pwidth * page->hres))
+@@ -5912,13 +5912,13 @@ computeOutputPixelOffsets (struct crop_mask *crop, struct image_data *image,
+ {
+ if (page->mode & PAGE_MODE_PAPERSIZE )
+ {
+- owidth = (uint32_t)((pwidth * page->hres) - (hmargin * 2));
+- olength = (uint32_t)((plength * page->vres) - (vmargin * 2));
++ owidth = _TIFFClampDoubleToUInt32((pwidth * page->hres) - (hmargin * 2));
++ olength = _TIFFClampDoubleToUInt32((plength * page->vres) - (vmargin * 2));
+ }
+ else
+ {
+- owidth = (uint32_t)(iwidth - (hmargin * 2 * page->hres));
+- olength = (uint32_t)(ilength - (vmargin * 2 * page->vres));
++ owidth = _TIFFClampDoubleToUInt32(iwidth - (hmargin * 2 * page->hres));
++ olength = _TIFFClampDoubleToUInt32(ilength - (vmargin * 2 * page->vres));
+ }
+ }
+
+@@ -5927,6 +5927,12 @@ computeOutputPixelOffsets (struct crop_mask *crop, struct image_data *image,
+ if (olength > ilength)
+ olength = ilength;
+
++ if (owidth == 0 || olength == 0)
++ {
++ TIFFError("computeOutputPixelOffsets", "Integer overflow when calculating the number of pages");
++ exit(EXIT_FAILURE);
++ }
++
+ /* Compute the number of pages required for Portrait or Landscape */
+ switch (page->orient)
+ {
+--
+GitLab
+
diff --git a/srcpkgs/tiff5/template b/srcpkgs/tiff5/template
new file mode 100644
index 0000000000000..aad4bdc098613
--- /dev/null
+++ b/srcpkgs/tiff5/template
@@ -0,0 +1,38 @@
+# Template file for 'tiff5'
+pkgname=tiff5
+version=4.4.0
+revision=1
+build_style=gnu-configure
+configure_args="--enable-cxx --without-x"
+makedepends="jbigkit-devel libjpeg-turbo-devel
+ liblzma-devel libzstd-devel zlib-devel"
+short_desc="Library and tools for reading and writing TIFF data files"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="custom:libtiff"
+homepage="http://www.simplesystems.org/libtiff/"
+distfiles="https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
+checksum=917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed
+
+post_install() {
+ for f in ${DESTDIR}/usr/share/man/man3/*.3tiff; do
+ mv ${f} ${f%tiff}
+ done
+ vlicense COPYRIGHT
+ # Remove binaries and their man pages.
+ rm "${DESTDIR}"/usr/bin/*
+ rm "${DESTDIR}"/usr/share/man/man1/*
+}
+
+tiff5-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ conflicts="tiff-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/man/man3
+ vmove usr/share/doc
+ }
+}
From 969490f97ae604f35d773eaa4d6de34aaa458167 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 29 Dec 2023 17:48:22 +0200
Subject: [PATCH 2/2] wps-office: update to 11.1.0.11711.
---
srcpkgs/wps-office/template | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 0f0d223fa812b..43c0f3d458e29 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,7 +1,7 @@
# Template file for 'wps-office'
pkgname=wps-office
-version=11.1.0.10920
-revision=2
+version=11.1.0.11711
+revision=1
archs="x86_64"
short_desc="Linux office suite with similar appearance to MS Office"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -12,8 +12,8 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:EULA"
homepage="http://wps-community.org"
changelog="https://www.wps.com/whatsnew/linux/"
-checksum=e252ac96473291df1e9dbeff2d1aedd1299f5ef411fa012ad617cfcd47dc3462
-# allow_unknown_shlibs=yes
+checksum=119a643c42d4b2fdc8e377f1a7625c31820ff11488c20b67a94c8ac662541d1a
+allow_unknown_shlibs=yes
nodebug=yes
nostrip=yes
restricted=yes
@@ -24,7 +24,7 @@ repository=nonfree
# The programs themselves are PIE, but the error reporter isn't :/
nopie=yes
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10920
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${version##*.}
_distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
distfiles="${_disturl}/${_distTar}"
@@ -57,4 +57,8 @@ post_install() {
rm -f ${DESTDIR}/opt/kingsoft/wps-office/office6/librpc{et,wps,wpp}api.so
# systemd
rm -f ${DESTDIR}/opt/kingsoft/wps-office/office6/libdbus-1.so*
+
+ # stdlibc++
+ rm -f ${DESTDIR}/opt/kingsoft/wps-office/office6/libstdc++.so.6
+ rm -f ${DESTDIR}/opt/kingsoft/wps-office/office6/libstdc++.so.6.0.28
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Wps office
2023-12-29 12:53 [PR PATCH] Wps office mobinmob
2023-12-29 15:48 ` [PR PATCH] [Updated] " mobinmob
@ 2023-12-29 15:51 ` mobinmob
2024-01-09 14:12 ` [PR REVIEW] " sgn
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: mobinmob @ 2023-12-29 15:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/47971#issuecomment-1872183501
Comment:
- Removed binaries under /usr/bin and their manpages under /usr/share/man1. They are not needed and they are conflicting with tiff.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] Wps office
2023-12-29 12:53 [PR PATCH] Wps office mobinmob
2023-12-29 15:48 ` [PR PATCH] [Updated] " mobinmob
2023-12-29 15:51 ` mobinmob
@ 2024-01-09 14:12 ` sgn
2024-01-09 14:13 ` sgn
2024-01-10 4:38 ` [PR PATCH] [Closed]: " sgn
4 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2024-01-09 14:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/47971#discussion_r1446138358
Comment:
May just remove the whole development stuff as well.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] Wps office
2023-12-29 12:53 [PR PATCH] Wps office mobinmob
` (2 preceding siblings ...)
2024-01-09 14:12 ` [PR REVIEW] " sgn
@ 2024-01-09 14:13 ` sgn
2024-01-10 4:38 ` [PR PATCH] [Closed]: " sgn
4 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2024-01-09 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/47971#discussion_r1446139523
Comment:
```suggestion
license="libtiff"
```
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Closed]: Wps office
2023-12-29 12:53 [PR PATCH] Wps office mobinmob
` (3 preceding siblings ...)
2024-01-09 14:13 ` sgn
@ 2024-01-10 4:38 ` sgn
4 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2024-01-10 4:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
There's a closed pull request on the void-packages repository
Wps office
https://github.com/void-linux/void-packages/pull/47971
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This PR introduces tiff5, and upgrades wps-office.
It fixes https://github.com/void-linux/void-packages/issues/44335 .
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PR PATCH] Wps office
@ 2021-01-24 21:02 mobinmob
0 siblings, 0 replies; 7+ messages in thread
From: mobinmob @ 2021-01-24 21:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages wps-office
https://github.com/void-linux/void-packages/pull/28197
Wps office
#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
#### Does it build and run successfully?
- [X] I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/28197.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wps-office-28197.patch --]
[-- Type: text/x-diff, Size: 3858 bytes --]
From c40446daf1417382a0b062bc00f227f9e6923f07 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 24 Jan 2021 22:21:50 +0200
Subject: [PATCH 1/2] xfce4-whiskermenu-plugin: update to 2.5.3.
---
| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 93a53ee68ad..62435ad6a56 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,6 +1,6 @@
# Template file for 'xfce4-whiskermenu-plugin'
pkgname=xfce4-whiskermenu-plugin
-version=2.5.2
+version=2.5.3
revision=1
build_style=cmake
hostmakedepends="gettext pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin"
changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=a6f7070afd1c9020257d8ed7483872643a6cddd76d5d73de107c7fbd981fc515
+checksum=39cc34c8a83381997c6faaacb6bf792339234303438a1fccd15c9a1770b87daf
From 2f4d393c3dbf64b5f2a54a4d917b0c8c1780178e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 24 Jan 2021 23:00:48 +0200
Subject: [PATCH 2/2] wps-office: update to 11.1.0.10161.
---
srcpkgs/wps-office/template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index f90dcfe9263..68180a6e4f5 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,29 +1,29 @@
# Template file for 'wps-office'
pkgname=wps-office
-version=11.1.0.9719
+version=11.1.0.10161
revision=1
archs="x86_64"
create_wrksrc=yes
makedepends="rpmextract"
short_desc="Linux office suite with similar appearance to MS Office"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-#The old Kingsoft WPS Community License has disappeared from the
-#site. There is an EULA in the archive which is instaled as license
-#and a non-downloadable EULA which is accesible from inside the program:
-#https://www.wps.com/eula?distsrc=2020help&lang=en_US&version=11.1.0.9719
+# The old Kingsoft WPS Community License has disappeared from the
+# site. There is an EULA in the archive which is instaled as license
+# and a non-downloadable EULA which is accesible from inside the program:
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
license="custom:EULA"
homepage="http://wps-community.org"
changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=6f3f1d2aa1f98aff397eac9b2d819d094dfc297b7340e20a70c5740eb6ea79f2
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
allow_unknown_shlibs=yes
nodebug=yes
restricted=yes
-#The programs themselves are PIE, but the error reporter isn't :/
+# The programs themselves are PIE, but the error reporter isn't :/
nopie=yes
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9719/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
_distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
distfiles="${_disturl}/${_distTar}"
@@ -34,13 +34,13 @@ do_install() {
post_install() {
- #Clean up:
- #Delete everything under /etc. It contains cron, logrotate and autostart
+ # Clean up:
+ # Delete everything under /etc. It contains cron, logrotate and autostart
# configuration for the update check and a seperate menu category for the
# wps programs that does not work.
rm -rf ${DESTDIR}/etc
- #Delete postinst and prerm scripts
+ # Delete postinst and prerm scripts
rm -rf ${DESTDIR}/opt/kingsoft/wps-office/INSTALL
# Install license
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-01-10 4:38 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-29 12:53 [PR PATCH] Wps office mobinmob
2023-12-29 15:48 ` [PR PATCH] [Updated] " mobinmob
2023-12-29 15:51 ` mobinmob
2024-01-09 14:12 ` [PR REVIEW] " sgn
2024-01-09 14:13 ` sgn
2024-01-10 4:38 ` [PR PATCH] [Closed]: " sgn
-- strict thread matches above, loose matches on Subject: below --
2021-01-24 21:02 [PR PATCH] " mobinmob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).