diff options
| -rw-r--r-- | groups.d/241.native_packages_inet.group | 4 | ||||
| -rw-r--r-- | patches/whois-5.5.21.local.patch (renamed from patches/whois-5.5.20.local.patch) | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/groups.d/241.native_packages_inet.group b/groups.d/241.native_packages_inet.group index 7e141818..35ce6d28 100644 --- a/groups.d/241.native_packages_inet.group +++ b/groups.d/241.native_packages_inet.group @@ -272,8 +272,8 @@ ac_cv_path_GPGRT_CONFIG=${PREFIX_NATIVE}/bin/gpgrt-config"}; : ${PKG_WGET2_VERSION:=2.0.1}; : ${PKG_WGET2_URL:=https://ftp.gnu.org/gnu/wget/wget2-${PKG_WGET2_VERSION}.tar.gz}; : ${PKG_WHOIS_DEPENDS:="libidn2"}; -: ${PKG_WHOIS_SHA256SUM:=e7674972682d805488198c3345be3f1faddf94656cd0d24876826cd802ddd86c}; -: ${PKG_WHOIS_VERSION:=5.5.20}; +: ${PKG_WHOIS_SHA256SUM:=4366a1c5e0e3e3e696de833bfa2620f8107d8fec9fc044c4a616eb805b08cc77}; +: ${PKG_WHOIS_VERSION:=5.5.21}; : ${PKG_WHOIS_URL:=https://github.com/rfc1036/whois/archive/v${PKG_WHOIS_VERSION}.tar.gz}; : ${PKG_WHOIS_IN_TREE:=1}; : ${PKG_WHOIS_CFLAGS_BUILD:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}}; diff --git a/patches/whois-5.5.20.local.patch b/patches/whois-5.5.21.local.patch index 0536845c..09cde92c 100644 --- a/patches/whois-5.5.20.local.patch +++ b/patches/whois-5.5.21.local.patch @@ -23,11 +23,11 @@ diff -ru whois-5.5.20.orig/utils.h whois-5.5.20/utils.h -whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn) -DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn) +ifeq ($(shell ${PKG_CONFIG} --exists 'libidn2 >= 2.0.3' || echo NO),) -+whois_LDADD += $(shell ${PKG_CONFIG} --libs libidn2) -+DEFS += -DHAVE_LIBIDN2 $(shell ${PKG_CONFIG} --cflags libidn2) ++whois_LDADD += $(shell ${PKG_CONFIG} --libs-only-l libidn2) ++DEFS += -DHAVE_LIBIDN2 $(shell ${PKG_CONFIG} --cflags-only-other libidn2) +else ifeq ($(shell ${PKG_CONFIG} --exists 'libidn' || echo NO),) -+whois_LDADD += $(shell ${PKG_CONFIG} --libs libidn) -+DEFS += -DHAVE_LIBIDN $(shell ${PKG_CONFIG} --cflags libidn) ++whois_LDADD += $(shell ${PKG_CONFIG} --libs-only-l libidn) ++DEFS += -DHAVE_LIBIDN $(shell ${PKG_CONFIG} --cflags-only-other libidn) endif ifdef HAVE_ICONV |