Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump(main/dnsutils): 9.20.4 #23013

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

bump(main/dnsutils): 9.20.4 #23013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5a7906
bump(main/dnsutils): 9.20.4
MrAdityaAlok Jan 23, 2025
74c3153
addpkg(main): liburcu
MrAdityaAlok Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 10 additions & 46 deletions packages/dnsutils/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,29 @@ TERMUX_PKG_HOMEPAGE=https://www.isc.org/downloads/bind/
TERMUX_PKG_DESCRIPTION="Clients provided with BIND"
TERMUX_PKG_LICENSE="MPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=9.16.41
TERMUX_PKG_VERSION=9.20.4
TERMUX_PKG_SRCURL="https://ftp.isc.org/isc/bind9/${TERMUX_PKG_VERSION}/bind-${TERMUX_PKG_VERSION}.tar.xz"
TERMUX_PKG_SHA256=71904366aa1e04e2075c79a8906b92af936e3bfa4d7e8df5fd964fcf9e94f45c
TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf, zlib, libuv"
TERMUX_PKG_SHA256=3a8e1a05e00e3e9bc02bdffded7862faf7726ba76ba997f42ab487777bd8210b
TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf, zlib, libuv, liburcu, libcap, libandroid-glob, libnghttp2"
TERMUX_PKG_BREAKS="dnsutils-dev"
TERMUX_PKG_REPLACES="dnsutils-dev"
TERMUX_PKG_BUILD_IN_SRC=true

TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-linux-caps
--without-python
--with-ecdsa=no
--with-gost=no
--with-gssapi=no
--with-libjson=no
--with-libtool
--with-libxml2=no
--with-openssl=$TERMUX_PREFIX
--with-randomdev=/dev/random
--with-readline=-lreadline
--with-eddsa=no
ax_cv_have_func_attribute_constructor=yes
ax_cv_have_func_attribute_destructor=yes
lt_cv_prog_compiler_pic_works=yes
--disable-static
"

termux_step_pre_configure() {
export BUILD_AR=ar
export BUILD_CC=gcc
export BUILD_CFLAGS=
export BUILD_CPPFLAGS=
export BUILD_LDFLAGS=
export BUILD_RANLIB=

_RESOLV_CONF=$TERMUX_PREFIX/etc/resolv.conf
CFLAGS+=" $CPPFLAGS -DRESOLV_CONF=\\\"$_RESOLV_CONF\\\""
LDFLAGS+=" -landroid-glob"
}

termux_step_make() {
make -C lib/isc
make -C lib/dns
make -C lib/ns
make -C lib/isccc
make -C lib/isccfg
make -C lib/bind9
make -C lib/irs
make -C bin/dig
make -C bin/delv
make -C bin/nsupdate
}

termux_step_make_install() {
make -C lib/isc install
make -C lib/dns install
make -C lib/ns install
make -C lib/isccc install
make -C lib/isccfg install
make -C lib/bind9 install
make -C lib/irs install
make -C bin/dig install
make -C bin/delv install
make -C bin/nsupdate install
termux_step_post_configure() {
# Android linker is unable to driectly reslove versoined libraries.
# This will create a symlink to versoined library via `libname.so`.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: typos, you type too fast I guess :D

driectly -> directly
reslove -> resolve
versoined -> versioned (in two places)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😅

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing it...

sed -i 's|library_names_spec=.*|library_names_spec="\\\$libname\\\$release\\\$shared_ext \\\$libname\\\$shared_ext"|g' ./libtool
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, why is this needed? The linuxandroid case in libtool.m4 already contains exactly this spec:

linux*android*)
  version_type=none # Android doesn't support versioned libraries.
  need_lib_prefix=no
  need_version=no
  library_names_spec='$libname$release$shared_ext $libname$shared_ext'

is it matching and using another case?

Copy link
Member Author

@MrAdityaAlok MrAdityaAlok Jan 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird....

I do not have ($libname$shared_ext) in library_names_spec locally.

Which version did you check?

}
66 changes: 0 additions & 66 deletions packages/dnsutils/fix-underlinking.patch
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions packages/dnsutils/lib-irs-context.c.patch
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions packages/liburcu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
TERMUX_PKG_HOMEPAGE="https://liburcu.org/"
TERMUX_PKG_DESCRIPTION="LGPLv2.1 userspace RCU (read-copy-update) library"
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_LICENSE_FILE="LICENSES/${TERMUX_PKG_LICENSE}-only.txt"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.15
TERMUX_PKG_SRCURL="https://lttng.org/files/urcu/userspace-rcu-latest-${TERMUX_PKG_VERSION}.tar.bz2"
TERMUX_PKG_SHA256=4f2d839af67905ad396d6d53ba5649b66113d90840dcbc89941e0da64bccd38c
12 changes: 12 additions & 0 deletions packages/liburcu/disable-tests.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Although it just builds, still disable it.
--- userspace-rcu-0.15.0/Makefile.in 2024-12-19 19:49:26.000000000 +0530
+++ userspace-rcu-0.15.0.mod/Makefile.in 2025-01-23 16:33:27.627942132 +0530
@@ -400,7 +400,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = include src doc tests extras
+SUBDIRS = include src doc extras
dist_doc_DATA = \
LICENSE.md \
README.md
Loading