Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

ldns: Migrate to using OpenSSL 3

This commit is contained in:
Lucy Phipps 2022-10-16 22:03:18 +01:00
parent f1dc71d82d
commit 4f6c9063f3
No known key found for this signature in database
GPG Key ID: 8F688A3DB7869BFE
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/ldns/acx_nlnetlabs.m4.patch
View File

@ -1,22 +0,0 @@
--- ./acx_nlnetlabs.m4.orig 2021-12-03 13:15:47.000000000 +0530
+++ ./acx_nlnetlabs.m4 2022-02-26 11:45:09.003626697 +0530
@@ -652,7 +652,7 @@
fi
for dir in $withval; do
ssldir="$dir"
- if test -f "$dir/include/openssl/ssl.h"; then
+ if test -f "$dir/include/openssl-1.1/openssl/ssl.h"; then
found_ssl="yes"
AC_DEFINE_UNQUOTED([HAVE_SSL], [], [Define if you have the SSL libraries installed.])
dnl assume /usr/include is already in the include-path.
@@ -675,8 +675,8 @@
LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir/lib64"
ACX_RUNTIME_PATH_ADD([$ssldir/lib64])
else
- LDFLAGS="$LDFLAGS -L$ssldir/lib"
- LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir/lib"
+ LDFLAGS="$LDFLAGS -L$ssldir/lib/openssl-1.1"
+ LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir/lib/openssl-1.1"
ACX_RUNTIME_PATH_ADD([$ssldir/lib])
fi
fi

10
packages/ldns/build.sh
View File

@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Library for simplifying DNS programming and supporting r
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.8.3
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://www.nlnetlabs.nl/downloads/ldns/ldns-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860
TERMUX_PKG_DEPENDS="openssl-1.1"
TERMUX_PKG_DEPENDS="openssl"
TERMUX_PKG_BREAKS="ldns-dev"
TERMUX_PKG_REPLACES="ldns-dev"
TERMUX_PKG_BUILD_IN_SRC=true
@ -17,11 +18,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
"
termux_step_pre_configure() {
CFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CFLAGS"
CPPFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CPPFLAGS"
CXXFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CXXFLAGS"
LDFLAGS="-L$TERMUX_PREFIX/lib/openssl-1.1 -Wl,-rpath=$TERMUX_PREFIX/lib/openssl-1.1 $LDFLAGS"
autoreconf -fi
}
@ -30,5 +26,3 @@ termux_step_post_make_install() {
mkdir -p $TERMUX_PREFIX/lib/pkgconfig
cp packaging/libldns.pc $TERMUX_PREFIX/lib/pkgconfig/libldns.pc
}