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

depends: unbound: update to 1.22.0 #9642

Merged
merged 1 commit into from
Jan 25, 2025
+12 −3
Merged

depends: unbound: update to 1.22.0 #9642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions contrib/depends/packages/unbound.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package=unbound
$(package)_version=1.19.1
$(package)_version=1.22.0
$(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9
$(package)_sha256_hash=c5dd1bdef5d5685b2cedb749158dd152c52d44f65529a34ac15cd88d4b1b3d43
$(package)_dependencies=openssl expat


define $(package)_set_vars
$(package)_config_opts=--disable-shared --enable-static --without-pyunbound --prefix=$(host_prefix)
$(package)_config_opts+=--with-libexpat=$(host_prefix) --with-ssl=$(host_prefix) --with-libevent=no
Expand All @@ -17,6 +16,12 @@ define $(package)_set_vars
$(package)_cflags_mingw32+="-D_WIN32_WINNT=0x600"
endef

# Remove blobs
define $(package)_preprocess_cmds
rm configure~ doc/*.odp doc/*.pdf contrib/*.tar.gz contrib/*.tar.bz2 &&\
Copy link

Choose a reason for hiding this comment

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

Could make this a little easier to read with alternate shell syntax:
rm configure~ doc/*.{odp,pdf} contrib/*.tar.{gz,bz2} ...

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Brace expansion isn't defined in POSIX. I didn't know this until I found out that:

In depends CI, which runs on Ubuntu 20.04, the SHELL environment variable isn't set by default causing make to fall back to /bin/sh, resulting in an error on this line. On 20.04 /bin/sh is Dash which tries to be POSIX compliant and does not support brace expansion.

For portability reasons, I have reverted back to the less readable syntax.

rm -rf testdata dnscrypt/testdata
endef

define $(package)_config_cmds
$($(package)_autoconf) ac_cv_func_getentropy=no AR_FLAGS=$($(package)_arflags)
endef
Expand All @@ -28,3 +33,7 @@ endef
define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef

define $(package)_postprocess_cmds
rm -rf share
endef
Loading