From 7e94d3e2e7ae85fabef5605cbd98ca3f67c27215 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 10 Mar 2022 11:04:42 +0100 Subject: [PATCH] biber: update to 2.17 And fix installation of Net::SSLeay with openssl3. Successful installation of biber also needs at least perl 5.34.0-4, which includes a fix so that 'ranlib' is not undefined. Without the fix installation of the dependency Unicode::LineBreak fails. --- packages/biber/build.sh | 10 +++++++--- packages/biber/installer.sh | 17 ++++++++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/packages/biber/build.sh b/packages/biber/build.sh index d4a1b8053..4cf4a60b1 100644 --- a/packages/biber/build.sh +++ b/packages/biber/build.sh @@ -2,26 +2,30 @@ TERMUX_PKG_HOMEPAGE=http://biblatex-biber.sourceforge.net TERMUX_PKG_DESCRIPTION="A Unicode-capable BibTeX replacement for biblatex users" TERMUX_PKG_LICENSE="Artistic-License-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" -TERMUX_PKG_VERSION=2.16 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=2.17 TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_PLATFORM_INDEPENDENT=true -TERMUX_PKG_DEPENDS="perl, libxslt, libxml2 (>> 2.9.10-3), openssl-tool, make, clang, pkg-config" +TERMUX_PKG_DEPENDS="perl (>> 5.34.0-3), libxslt, libxml2 (>> 2.9.10-3), openssl-tool, make, clang, pkg-config" EXTUTILS_LIBBUILDER_VERSION=0.08 TEXT_BIBTEX_VERSION=0.88 +# Build from latest Net::SSLeay version to get openssl3 compatibility, +# should be fixed in release 1.93. +NET_SSLEAY_VERSION=281c44cd31002d355a9cbfaa339c90ef035e5f90 termux_step_make_install() { mkdir -p $TERMUX_PREFIX/opt/biber sed -e "s|@TERMUX_PREFIX@|${TERMUX_PREFIX}|g" \ -e "s|@TEXT_BIBTEX_VERSION@|${TEXT_BIBTEX_VERSION}|g" \ -e "s|@EXTUTILS_LIBBUILDER_VERSION@|${EXTUTILS_LIBBUILDER_VERSION}|g" \ + -e "s|@NET_SSLEAY_VERSION@|${NET_SSLEAY_VERSION}|g" \ -e "s|@BIBER_VERSION@|${TERMUX_PKG_VERSION}|g" \ "$TERMUX_PKG_BUILDER_DIR"/installer.sh \ > $TERMUX_PREFIX/bin/termux-install-biber chmod 700 $TERMUX_PREFIX/bin/termux-install-biber install -m600 "$TERMUX_PKG_BUILDER_DIR"/ExtUtils-LibBuilder.diff $TERMUX_PREFIX/opt/biber/ install -m600 "$TERMUX_PKG_BUILDER_DIR"/Text-BibTeX.diff $TERMUX_PREFIX/opt/biber/ + install -m600 "$TERMUX_PKG_BUILDER_DIR"/Net-SSLeay.diff $TERMUX_PREFIX/opt/biber/ # Uninstalling all dependencies on uninstall would be annoying, so # lets leave that for the user to deal with.. } diff --git a/packages/biber/installer.sh b/packages/biber/installer.sh index 4b17ed3db..ca03f8570 100644 --- a/packages/biber/installer.sh +++ b/packages/biber/installer.sh @@ -10,6 +10,7 @@ export PREFIX=@TERMUX_PREFIX@ export TMPDIR=@TERMUX_PREFIX@/tmp export EXTUTILS_LIBBUILDER_VERSION=@EXTUTILS_LIBBUILDER_VERSION@ export TEXT_BIBTEX_VERSION=@TEXT_BIBTEX_VERSION@ +export NET_SSLEAY_VERSION=@NET_SSLEAY_VERSION@ export BIBER_VERSION=@BIBER_VERSION@ # Lock terminal to prevent sending text input and special key @@ -46,12 +47,26 @@ if [ ! -f Text-BibTeX-${TEXT_BIBTEX_VERSION}.tar.gz ]; then else rm -rf Text-BibTeX-${TEXT_BIBTEX_VERSION} fi -tar -xf Text-BibTeX-${TEXT_BIBTEX_VERSION}.tar.gz && cd Text-BibTeX-${TEXT_BIBTEX_VERSION} +tar -xf Text-BibTeX-${TEXT_BIBTEX_VERSION}.tar.gz +cd Text-BibTeX-${TEXT_BIBTEX_VERSION} patch -Np1 -i $PREFIX/opt/biber/Text-BibTeX.diff cpanm . cd .. +if [ ! -f p5-net-ssleay-${NET_SSLEAY_VERSION}.tar.gz ]; then + curl --fail --retry 3 --location --output "$TMPDIR/p5-net-ssleay-${NET_SSLEAY_VERSION}.tar.gz" \ + "https://github.com/radiator-software/p5-net-ssleay/archive/${NET_SSLEAY_VERSION}.tar.gz" +else + rm -rf p5-net-ssleay-${NET_SSLEAY_VERSION} +fi +tar -xf p5-net-ssleay-${NET_SSLEAY_VERSION}.tar.gz +cd p5-net-ssleay-${NET_SSLEAY_VERSION} +patch -Np1 -i $PREFIX/opt/biber/Net-SSLeay.diff +cpanm . + +cd .. + echo "[*] Installing biber and its dependencies (may take long time)..." if [ ! -f biber-${BIBER_VERSION}.tar.gz ]; then