diff options
| -rw-r--r-- | groups.d/241.native_packages_inet.group | 6 | ||||
| -rw-r--r-- | patches/ldns-1.7.0.local.patch | 129 | ||||
| -rw-r--r-- | patches/ldns-1.8.3.local.patch | 75 |
3 files changed, 78 insertions, 132 deletions
diff --git a/groups.d/241.native_packages_inet.group b/groups.d/241.native_packages_inet.group index dd31c7fe..2d671758 100644 --- a/groups.d/241.native_packages_inet.group +++ b/groups.d/241.native_packages_inet.group @@ -122,10 +122,10 @@ gl_cv_ld_output_def=no"}; : ${PKG_ISYNC_URL:=https://sources.voidlinux.org/isync-${PKG_ISYNC_VERSION}/isync-${PKG_ISYNC_VERSION}.tar.gz}; : ${PKG_ISYNC_CFLAGS_CONFIGURE_EXTRA:=-std=c99}; : ${PKG_LDNS_DEPENDS:="libressl"}; -: ${PKG_LDNS_SHA256SUM:=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc}; -: ${PKG_LDNS_VERSION:=1.7.0}; +: ${PKG_LDNS_SHA256SUM:=c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860}; +: ${PKG_LDNS_VERSION:=1.8.3}; : ${PKG_LDNS_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/ldns/ldns-${PKG_LDNS_VERSION}.tar.gz}; -: ${PKG_LDNS_CONFIGURE_ARGS_EXTRA:="--with-ssl=${PREFIX_NATIVE} --disable-dane-ta-usage --with-drill --with-examples"}; +: ${PKG_LDNS_CONFIGURE_ARGS_EXTRA:="--with-ssl=${PREFIX_NATIVE} --disable-dane-ta-usage --disable-gost --with-drill --with-examples"}; : ${PKG_LDNS_MAKEFLAGS_PARALLELISE:="-j1"}; : ${PKG_LIGHTTPD_DEPENDS:="bzip2 pcre libressl libsasl2 libz gnutls"}; : ${PKG_LIGHTTPD_SHA256SUM:=b8b6915da20396fdc354df3324d5e440169b2e5ea7859e3a775213841325afac}; diff --git a/patches/ldns-1.7.0.local.patch b/patches/ldns-1.7.0.local.patch deleted file mode 100644 index 5a53d0bd..00000000 --- a/patches/ldns-1.7.0.local.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -ru ldns-1.7.0.orig/dnssec.c ldns-1.7.0/dnssec.c ---- ldns-1.7.0.orig/dnssec.c 2016-12-20 11:48:22.000000000 +0100 -+++ ldns-1.7.0/dnssec.c 2022-03-04 03:18:52.759678825 +0100 -@@ -375,7 +375,7 @@ - BN_free(Y); - return NULL; - } --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL - #ifndef S_SPLINT_S - dsa->p = P; - dsa->q = Q; -@@ -461,7 +461,7 @@ - BN_free(modulus); - return NULL; - } --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL - #ifndef S_SPLINT_S - rsa->n = modulus; - rsa->e = exponent; -diff -ru ldns-1.7.0.orig/host2str.c ldns-1.7.0/host2str.c ---- ldns-1.7.0.orig/host2str.c 2016-12-20 11:48:22.000000000 +0100 -+++ ldns-1.7.0/host2str.c 2022-03-04 03:18:52.759678825 +0100 -@@ -2040,7 +2040,7 @@ - const BIGNUM *n=NULL, *e=NULL, *d=NULL, - *p=NULL, *q=NULL, *dmp1=NULL, - *dmq1=NULL, *iqmp=NULL; --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL - n = rsa->n; - e = rsa->e; - d = rsa->d; -@@ -2092,7 +2092,7 @@ - if(1) { - const BIGNUM *p=NULL, *q=NULL, *g=NULL, - *priv_key=NULL, *pub_key=NULL; --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL - #ifndef S_SPLINT_S - p = dsa->p; - q = dsa->q; -diff -ru ldns-1.7.0.orig/keys.c ldns-1.7.0/keys.c ---- ldns-1.7.0.orig/keys.c 2016-12-20 11:48:22.000000000 +0100 -+++ ldns-1.7.0/keys.c 2022-03-04 03:18:52.759678825 +0100 -@@ -898,7 +898,7 @@ - } - #endif /* splint */ - --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL - # ifndef S_SPLINT_S - rsa->n = n; - rsa->e = e; -@@ -1018,7 +1018,7 @@ - } - #endif /* splint */ - --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL - # ifndef S_SPLINT_S - dsa->p = p; - dsa->q = q; -@@ -1713,7 +1713,7 @@ - if (!k) { - return false; - } --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL - n = k->n; - e = k->e; - #else -Only in ldns-1.7.0: ldns-1.7.0.local.patch -diff -ru ldns-1.7.0.orig/Makefile.in ldns-1.7.0/Makefile.in ---- ldns-1.7.0.orig/Makefile.in 2016-12-20 11:48:22.000000000 +0100 -+++ ldns-1.7.0/Makefile.in 2022-03-04 03:19:09.959679170 +0100 -@@ -148,7 +148,7 @@ - fi - - drill/drill: $(DRILL_LOBJS) $(LIB) -- $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill -+ $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -L./lib -lldns -o drill/drill - - drill/drill.1: $(srcdir)/drill/drill.1.in - $(edit) $(srcdir)/drill/drill.1.in > drill/drill.1 -@@ -179,21 +179,21 @@ - fi - - $(EXAMPLE_PROGS): -- $(LINK_EXE) $@.lo $(LIBS) -lldns -o $@ -+ $(LINK_EXE) $@.lo $(LIBS) -L./lib -lldns -o $@ - - $(TESTNS): -- $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS) -+ $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -L./lib -lldns -o $(TESTNS) - - $(LDNS_DPA): -- $(LINK_EXE) $(LDNS_DPA_LOBJS) $(LIBS) $(LIBPCAP_LIBS) -lldns \ -+ $(LINK_EXE) $(LDNS_DPA_LOBJS) $(LIBS) $(LIBPCAP_LIBS) -L./lib -lldns \ - -o $(LDNS_DPA) - - $(LDNS_DANE): -- $(LINK_EXE) $(LDNS_DANE_LOBJS) $(LIBS) $(LIBSSL_SSL_LIBS) -lldns \ -+ $(LINK_EXE) $(LDNS_DANE_LOBJS) $(LIBS) $(LIBSSL_SSL_LIBS) -L./lib -lldns \ - -o $(LDNS_DANE) - - $(EX_SSL_PROGS): -- $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@ -+ $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -L./lib -lldns -o $@ - - examples/ldns-dane.1: $(srcdir)/examples/ldns-dane.1.in - $(edit) $(srcdir)/examples/ldns-dane.1.in > examples/ldns-dane.1 -@@ -228,14 +228,14 @@ - - linktest: $(srcdir)/linktest.c libldns.la - $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/linktest.c -o linktest.lo -- $(LINK_EXE) linktest.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o linktest -+ $(LINK_EXE) linktest.lo $(LIBS) $(LIBSSL_LIBS) -L./lib -lldns -o linktest - - lib: libldns.la - - lib-export-all: libldns.la-export-all - - libldns.la: $(LDNS_ALL_LOBJS) -- $(LINK_LIB) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) -export-symbols-regex '^(ldns_|b32_[pn]to[pn]|mktime_from_utc|qsort_rr_compare_nsec3)' -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH) -+ $(LINK_LIB) $(LIBSSL_LDFLAGS) -export-symbols-regex '^(ldns_|b32_[pn]to[pn]|mktime_from_utc|qsort_rr_compare_nsec3)' -o libldns.la $(LDNS_ALL_LOBJS) $(LIBSSL_LIBS) -rpath $(libdir) $(RUNTIME_PATH) - - libldns.la-export-all: $(LDNS_ALL_LOBJS) - $(LINK_LIB) -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH) diff --git a/patches/ldns-1.8.3.local.patch b/patches/ldns-1.8.3.local.patch new file mode 100644 index 00000000..ef089e47 --- /dev/null +++ b/patches/ldns-1.8.3.local.patch @@ -0,0 +1,75 @@ +diff -ru ldns-1.8.3.orig/Makefile.in ldns-1.8.3/Makefile.in +--- ldns-1.8.3.orig/Makefile.in 2023-09-14 16:27:42.808302266 +0200 ++++ ldns-1.8.3/Makefile.in 2023-09-14 16:24:26.011635647 +0200 +@@ -27,6 +27,7 @@ + pyldnsx_uninst = @PYLDNSXUNINST@ + libtool = @libtool@ + CONFIG_FILES = @CONFIG_FILES@ ++top_builddir = @top_builddir@ + + LDNS_TRUST_ANCHOR_FILE = @LDNS_TRUST_ANCHOR_FILE@ + DEFAULT_CAFILE = @DEFAULT_CAFILE@ +@@ -119,7 +120,7 @@ + COMP_LIB = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) + LINK = $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) + LINK_LIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -version-info $(version_info) -no-undefined +-LINK_EXE = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBSSL_LDFLAGS) ++LINK_EXE = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) + + .PHONY: clean realclean docclean manpages doc lint all lib pyldns test + .PHONY: install uninstall install-doc uninstall-doc uninstall-pyldns +@@ -168,7 +169,7 @@ + fi + + drill/drill: $(DRILL_LOBJS) $(LIB) $(LIBLOBJS) +- $(LINK_EXE) $(DRILL_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o drill/drill ++ $(LINK_EXE) $(DRILL_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) -o drill/drill $(top_builddir)/libldns.la + + drill/drill.1: $(srcdir)/drill/drill.1.in + $(edit) $(srcdir)/drill/drill.1.in > drill/drill.1 +@@ -200,23 +201,23 @@ + + # Need LIBSSL_LIBS + $(EXAMPLE_PROGS): +- $(LINK_EXE) $@.lo $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $@ ++ $(LINK_EXE) $@.lo $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $@ $(top_builddir)/libldns.la + + # Need LIBSSL_LIBS + $(TESTNS): +- $(LINK_EXE) $(TESTNS_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $(TESTNS) ++ $(LINK_EXE) $(TESTNS_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $(TESTNS) $(top_builddir)/libldns.la + + # Need LIBSSL_LIBS + $(LDNS_DPA): + $(LINK_EXE) $(LDNS_DPA_LOBJS) $(LIBLOBJS) $(LIB) $(LIBPCAP_LIBS) $(LIBSSL_LIBS) $(LIBS) \ +- -o $(LDNS_DPA) ++ -o $(LDNS_DPA) $(top_builddir)/libldns.la + + $(LDNS_DANE): + $(LINK_EXE) $(LDNS_DANE_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_SSL_LIBS) $(LIBS) \ +- -o $(LDNS_DANE) ++ -o $(LDNS_DANE) $(top_builddir)/libldns.la + + $(EX_SSL_PROGS): +- $(LINK_EXE) $@.lo $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $@ ++ $(LINK_EXE) $@.lo $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $@ $(top_builddir)/libldns.la + + examples/ldns-dane.1: $(srcdir)/examples/ldns-dane.1.in + $(edit) $(srcdir)/examples/ldns-dane.1.in > examples/ldns-dane.1 +@@ -251,14 +252,14 @@ + + linktest: $(srcdir)/linktest.c libldns.la + $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/linktest.c -o linktest.lo +- $(LINK_EXE) linktest.lo $(LIB) $(LIBSSL_LIBS) $(LIBS) -o linktest ++ $(LINK_EXE) linktest.lo $(LIB) $(LIBSSL_LIBS) $(LIBS) -o linktest $(top_builddir)/libldns.la + + lib: libldns.la + + lib-export-all: libldns.la-export-all + + libldns.la: $(LDNS_ALL_LOBJS) +- $(LINK_LIB) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) -export-symbols-regex '^(ldns_|b32_[pn]to[pn]|mktime_from_utc|qsort_rr_compare_nsec3)' -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH) ++ $(LINK_LIB) $(LIBSSL_LIBS) -export-symbols-regex '^(ldns_|b32_[pn]to[pn]|mktime_from_utc|qsort_rr_compare_nsec3)' -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH) + + libldns.la-export-all: $(LDNS_ALL_LOBJS) + $(LINK_LIB) -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH) |