[libreoffice] 01/11: don't uselessly check for openssl and don't require openssl in postgresql-sdbc-impl, not (directly) used
Rene Engelhard
rene at moszumanska.debian.org
Tue Nov 15 21:57:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit df203701dc422d8776235a6d1b1fb712933889a6
Author: Rene Engelhard <rene at debian.org>
Date: Thu Nov 3 08:02:25 2016 +0100
don't uselessly check for openssl and don't require openssl in postgresql-sdbc-impl, not (directly) used
---
changelog | 2 +
control | 1 -
patches/no-openssl.diff | 118 ++++++++++++++++++++++++++++++++++++++++++++++++
patches/series | 1 +
rules | 5 --
tests/control | 2 +-
6 files changed, 122 insertions(+), 7 deletions(-)
diff --git a/changelog b/changelog
index 6f14d00..ab00239 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ libreoffice (1:5.2.3-1) UNRELEASED; urgency=medium
* debian/patches/show-vcl-backend-in-about.diff: as name says; backport from
master
+ * debian/patches/no-openssl.diff: don't uselessly check for openssl and
+ don't require openssl in postgresql-sdbc-impl, not (directly) used
* debian/control.in:
- add Breaks: browser-plugin-libreoffice to libreoffice-core
diff --git a/control b/control
index 5a40e24..37f079d 100644
--- a/control
+++ b/control
@@ -112,7 +112,6 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
librevenge-dev,
libsane-dev,
libsm-dev,
- libssl-dev (>= 0.9.8),
libsuitesparse-dev (>= 1:3.4.0),
libvisio-dev (>= 0.1),
libvlc5,
diff --git a/patches/no-openssl.diff b/patches/no-openssl.diff
new file mode 100644
index 0000000..b2e6ae7
--- /dev/null
+++ b/patches/no-openssl.diff
@@ -0,0 +1,118 @@
+don't add -lssl etc if not needed (because we use system-postgresql)
+
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index 0fc7d25..952b140 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -2911,9 +2917,10 @@ $(call gb_LinkTarget_add_libs,$(1),\
+ $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
+ )
+
+-ifeq ($(OS)$(COM),WNTMSC)
+ $(call gb_LinkTarget_use_external,$(1),openssl)
+
++ifeq ($(OS)$(COM),WNTMSC)
++
+ $(call gb_LinkTarget_use_system_win32_libs,$(1),\
+ secur32 \
+ ws2_32 \
+diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
+index 0580a8b..7e8b778 100644
+--- a/connectivity/Library_postgresql-sdbc-impl.mk
++++ b/connectivity/Library_postgresql-sdbc-impl.mk
+@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
+ boost_headers \
+ postgresql \
+ $(if $(filter-out MSC,$(COM)), \
+- openssl \
+ openldap \
+ nss3 \
+ plc4 \
+
+... and don't uselessly check for openssl in configure
+
+diff --git a/config_host.mk.in b/config_host.mk.in
+index ddd144e..19f8368 100644
+--- a/config_host.mk.in
++++ b/config_host.mk.in
+@@ -100,7 +102,6 @@ export DISABLE_ATL=@DISABLE_ATL@
+ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
+ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
+ export DISABLE_EXPORT=@DISABLE_EXPORT@
+-export DISABLE_OPENSSL=@DISABLE_OPENSSL@
+ export DISABLE_PYTHON=@DISABLE_PYTHON@
+ export DLOPEN_LIBS=@DLOPEN_LIBS@
+ export DLLTOOL=@DLLTOOL@
+@@ -438,8 +439,6 @@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
+ export OOO_VENDOR=@OOO_VENDOR@
+ export OPENCOLLADA_CFLAGS=$(gb_SPACE)@OPENCOLLADA_CFLAGS@
+ export OPENCOLLADA_LIBS=$(gb_SPACE)@OPENCOLLADA_LIBS@
+-export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
+-export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
+ export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
+ export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
+ export OS=@OS@
+@@ -569,7 +568,6 @@ export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
+ export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@
+ export SYSTEM_OPENCOLLADA=@SYSTEM_OPENCOLLADA@
+ export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
+-export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
+ export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@
+ export SYSTEM_POPPLER=@SYSTEM_POPPLER@
+ export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
+diff --git a/configure.ac b/configure.ac
+index 3862386..45d5e25 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9412,51 +9451,6 @@ else
+ fi
+
+ dnl ===================================================================
+-dnl Check for system openssl
+-dnl ===================================================================
+-DISABLE_OPENSSL=
+-AC_MSG_CHECKING([whether to disable OpenSSL usage])
+-if test "$enable_openssl" = "yes"; then
+- AC_MSG_RESULT([no])
+- if test "$_os" = Darwin ; then
+- # OpenSSL is deprecated when building for 10.7 or later.
+- #
+- # http://stackoverflow.com/questions/7406946/why-is-apple-deprecating-openssl-in-macos-10-7-lion
+- # http://stackoverflow.com/questions/7475914/libcrypto-deprecated-on-mac-os-x-10-7-lion
+-
+- with_system_openssl=no
+- libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl])
+- elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \
+- && test "$with_system_openssl" != "no"; then
+- with_system_openssl=yes
+- SYSTEM_OPENSSL=TRUE
+- OPENSSL_CFLAGS=
+- OPENSSL_LIBS="-lssl -lcrypto"
+- else
+- libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl])
+- fi
+- if test "$with_system_openssl" = "yes"; then
+- libo_MINGW_CHECK_DLL([libssl])
+- libo_MINGW_CHECK_DLL([libcrypto])
+- AC_MSG_CHECKING([whether openssl supports SHA512])
+- AC_LANG_PUSH([C])
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/sha.h>]],[[
+- SHA512_CTX context;
+-]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no, openssl too old. Need >= 0.9.8.])])
+- AC_LANG_POP(C)
+- fi
+-else
+- AC_MSG_RESULT([yes])
+- DISABLE_OPENSSL=TRUE
+-
+- # warn that although OpenSSL is disabled, system libraries may be depending on it
+- AC_MSG_WARN([OpenSSL has been disabled. No code compiled by LibO will make use of it but system librares may create indirect dependencies])
+- add_warning "OpenSSL has been disabled. No code compiled by LibO will make use of it but system librares may create indirect dependencies"
+-fi
+-
+-AC_SUBST([DISABLE_OPENSSL])
+-
+-dnl ===================================================================
+ dnl Check for building gnutls
+ dnl ===================================================================
+ AC_MSG_CHECKING([whether to use gnutls])
diff --git a/patches/series b/patches/series
index 18dbe29..01fc217 100644
--- a/patches/series
+++ b/patches/series
@@ -33,3 +33,4 @@ no-packagekit-per-default.diff
sparc64.diff
startcenter-grey-out-not-installed.diff
show-vcl-backend-in-about.diff
+no-openssl.diff
diff --git a/rules b/rules
index 527b5d6..853cd01 100755
--- a/rules
+++ b/rules
@@ -372,7 +372,6 @@ ifeq "$(ENABLE_GLTF)" "y"
COLLADA2GLTF_MINVER=
endif
endif
-SYSTEM_STUFF += openssl
ifeq "$(ENABLE_JAVA)" "y"
ENABLE_REPORTDESIGN=y
SYSTEM_STUFF += jfreereport
@@ -865,10 +864,6 @@ else
BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER), libbz2-dev
endif
-ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libssl-dev (>= 0.9.8)
- DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so | cut -d"." -f3,4,5)-dbg
-endif
OPENCL_SUGGESTS := ocl-icd-libopencl1
ifeq "$(shell echo $(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)" "true"
diff --git a/tests/control b/tests/control
index f9f2ce7..2c5b0cc 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list