CVS commit: pkgsrc/misc/libreoffice

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Apr 10 13:13:47 UTC 2021

Modified Files:
        pkgsrc/misc/libreoffice: Makefile distinfo
        pkgsrc/misc/libreoffice/patches:
            patch-shell_source_unix_misc_senddoc.sh

Log Message:
libreoffice: Use portable 'command -v' instead of 'type -p' and fix segfault

Pointed out in PR pkg/56092 by gutteridge@.

And convert to use OpenSSL TLS backend.
Recent devel/nss change, libsoftkn3.so uses MD5_Update()
from OpenSSL and it causes SIGSEGV.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.112 -r1.113 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/libreoffice/patches/patch-shell_source_unix_misc_senddoc.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.256 pkgsrc/misc/libreoffice/Makefile:1.257
--- pkgsrc/misc/libreoffice/Makefile:1.256      Fri Apr  9 06:55:01 2021
+++ pkgsrc/misc/libreoffice/Makefile    Sat Apr 10 13:13:47 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.256 2021/04/09 06:55:01 wiz Exp $
+# $NetBSD: Makefile,v 1.257 2021/04/10 13:13:47 ryoon Exp $
 
 VERREL=                7.1.2
 VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
@@ -209,7 +209,7 @@ CONFIGURE_ARGS+=    --with-boost-libdir=${B
 CONFIGURE_ARGS+=       --with-system-libs
 CONFIGURE_ARGS+=       --with-system-dicts
 CONFIGURE_ARGS+=       --with-vendor="pkgsrc"
-CONFIGURE_ARGS+=       --with-tls="nss"
+CONFIGURE_ARGS+=       --with-tls="openssl"
 CONFIGURE_ARGS+=       --without-doxygen
 CONFIGURE_ARGS+=       --without-junit
 CONFIGURE_ARGS+=       --without-krb5

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.112 pkgsrc/misc/libreoffice/distinfo:1.113
--- pkgsrc/misc/libreoffice/distinfo:1.112      Mon Apr  5 10:17:21 2021
+++ pkgsrc/misc/libreoffice/distinfo    Sat Apr 10 13:13:47 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.112 2021/04/05 10:17:21 ryoon Exp $
+$NetBSD: distinfo,v 1.113 2021/04/10 13:13:47 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -246,7 +246,7 @@ SHA1 (patch-sal_osl_unx_system.hxx) = 47
 SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
 SHA1 (patch-sc_source_core_tool_math.cxx) = f288902962ad5d14dc766d1306d20c3122130cd6
 SHA1 (patch-shell_source_unix_exec_shellexec.cxx) = 823069dbc63274f965f8a76b2e542a96329642f3
-SHA1 (patch-shell_source_unix_misc_senddoc.sh) = 5df842020a7021543f86e263e3ce2ce93af81b62
+SHA1 (patch-shell_source_unix_misc_senddoc.sh) = bd9916bf87a9db8098b432b792a72a23eb748efb
 SHA1 (patch-slideshow_source_engine_box2dtools.cxx) = b59a872552754af29ce6208fd9dd3e25633c9fba
 SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
 SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1

Index: pkgsrc/misc/libreoffice/patches/patch-shell_source_unix_misc_senddoc.sh
diff -u pkgsrc/misc/libreoffice/patches/patch-shell_source_unix_misc_senddoc.sh:1.1 pkgsrc/misc/libreoffice/patches/patch-shell_source_unix_misc_senddoc.sh:1.2
--- pkgsrc/misc/libreoffice/patches/patch-shell_source_unix_misc_senddoc.sh:1.1 Mon Apr  5 10:17:21 2021
+++ pkgsrc/misc/libreoffice/patches/patch-shell_source_unix_misc_senddoc.sh     Sat Apr 10 13:13:47 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-shell_source_unix_misc_senddoc.sh,v 1.1 2021/04/05 10:17:21 ryoon Exp $
+$NetBSD: patch-shell_source_unix_misc_senddoc.sh,v 1.2 2021/04/10 13:13:47 ryoon Exp $
 
 * Fix xdg-open path. PR pkg/56092
   https://bugs.documentfoundation.org/show_bug.cgi?id=108591
@@ -9,8 +9,8 @@ $NetBSD: patch-shell_source_unix_misc_se
              MAILER=/usr/bin/kde-open
          elif [ -x /usr/bin/xdg-open ] ; then
              MAILER=/usr/bin/xdg-open
-+        elif type -p xdg-open >/dev/null 2>&1 ; then
-+            MAILER="$(type -p xdg-open)"
++        elif command -v xdg-open >/dev/null 2>&1 ; then
++            MAILER="$(command -v xdg-open)"
          else
              echo "Unsupported mail client: $(basename $MAILER | sed 's/-.*^//')"
              exit 2