From patchwork Tue Jun 2 19:36:07 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 9893 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4gVLfl3sBdz3wrg for ; Tue, 02 Jun 2026 19:36:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail02.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4gVLfl34Rgz6n1 for ; Tue, 02 Jun 2026 19:36:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4gVLfl2HgQz2xSM for ; Tue, 02 Jun 2026 19:36:15 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gVLfh5jnvz308L for ; Tue, 02 Jun 2026 19:36:12 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4gVLff6Gbpz2lH; Tue, 02 Jun 2026 19:36:10 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1780428970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b6i3BbvCRJLdaW4HiaCrxH51OO7qVymXS3f0W8n6pwc=; b=cvwqwBgu0m1BKGQqwR/ZZoLxNBIX9JrXIDV0fCw269fzg22c+5c0u3qw7boZu7nONj8shM SjvSB8IsJcb0jeDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1780428970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b6i3BbvCRJLdaW4HiaCrxH51OO7qVymXS3f0W8n6pwc=; b=GDYaLvRxAZ94cLbWlppACj40WcEjXyyVJtCB+ayzDILwbHM35SdDCcdfHY7sa+L7/L6al3 gk9GbVO+Af5DXi5FDWu599iTYjDb7fGeAweoWDS3zahN5JrCkTrhV/P5G7n6JNGKJalsf1 GzigMIfeYUHq0BKQswy86vePbyPHzmhPHWknFBQQafDuWddjfof9U3TX/54iojkBOZBOL4 NVy83Lfip/OgtxDBsM6rQbiPkuQlyJFrV8jGK6ei/btFFsNTF+XmDitUDR9iTHrMyQxyff 2diImcaH7ox5evUhGlWmaw0ibuwq/Im0+QnBN7E0KIy1cVjTDqdKo0Fs1Y/4pQ== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] libloc: Update to version 0.9.19 Date: Tue, 2 Jun 2026 21:36:07 +0200 Message-ID: <20260602193607.3590604-2-adolf.belka@ipfire.org> In-Reply-To: <20260602193607.3590604-1-adolf.belka@ipfire.org> References: <20260602193607.3590604-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - Update from version 0.9.18 to 0.9.19 - No change in rootfile - Two of the patches have been removed as ther are now built into the tarball - Changelog 0.9.19 * jenkins: Publish Debian packages for all supported architectures * address: Fix endianess problem when fetching octets in IPv4 addresses * jenkins: Build for s390x again * jenkins: Try building for Alma Linux 9 * jenkins: Fix installing development tools on Alma Linux * jenkins: Alma Linux does not seem to understand Code Ready * jenkins: Okay, drop Alma Linux again * configure: Fix indentation * configure: Fix passing custom LDFLAGS * jenkins: Build Debian packages for riscv64, too * Revert "jenkins: Build Debian packages for riscv64, too" * jenkins: Fedora no longer seems to install awk by default * python: Cleanup the switch statement * database: Fix backtracking after no match was found at the end of the tree * jenkins: Explicitely install gettext/autopoint * importer: Fix SyntaxWarning about regular expressions * importer: Accept ASNs larger than PostgreSQL's integer * po: Import the POT file and create a target to update it * python: network: Add a new property "subnets" to fetch any subnets * location: Add a command to export the database as a DNS zone file * network: Refactor composing the reverse pointer * export: Support exporting a zone with all bogons * export: Give the origin zone the correct name * export: Refactor writing zones * exporter: Implement exporting AS names over DNS * po: Add new translation strings * exporter: Call the correct functions * export: Support exporting a zone with country codes * export: Support exporting a zone with the network prefixes * export: Write the everything zone * export: Write a SOA for all DNS zones * export: Allow passing nameservers for a zone * export: Write more metadata into the zone apex * jenkins: Build for Ubuntu 25.10, but no longer for 24.10 * po: Update translation * export: Improve the slightly broken header in DNS zones * importer: Add some more AWS regions * jenkins: Build for more recent version of Debian/Ubuntu/Fedora * jenkins: Build packages for Debian Forky, too * tests: Ensure loc_database_lookup finds a match * configure: Explicitely configure Gettext Signed-off-by: Adolf Belka --- lfs/libloc | 24 +++++++------- ...tch_was_found_at_the_end_of_the_tree.patch | 31 ------------------- .../libloc-0.9.18_gettext-0.25_fix.patch | 29 ----------------- 3 files changed, 11 insertions(+), 73 deletions(-) delete mode 100644 src/patches/libloc-0.9.18_Fix_backtracking_after_no_match_was_found_at_the_end_of_the_tree.patch delete mode 100644 src/patches/libloc-0.9.18_gettext-0.25_fix.patch diff --git a/lfs/libloc b/lfs/libloc index 9bf08f28e..5aee8813f 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -24,8 +24,8 @@ include Config -VER = 0.9.18 -DB_DATE = 2025-03-11 +VER = 0.9.19 +DB_DATE = 2026-06-02 DB_TIME = 03:45 THISAPP = libloc-$(VER) @@ -44,8 +44,8 @@ objects = $(DL_FILE) \ $(DL_FILE) = https://source.ipfire.org/releases/libloc/$(DL_FILE) location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE)-$(DB_TIME).db.xz -$(DL_FILE)_BLAKE2 = ccb730684c98756ef318f0cd5698b42ee4a997083811025ac5bf650798efb70dca97e1638b3f20da5d7b38a204fe5214a87fa7b61b8b70d71e6c8ad0577b0839 -location-$(DB_DATE).db.xz_BLAKE2 = adce971179f19c28906842ac08e5b90d55f73d91e0ffa27f98777c1ce8882dc9c4d1df1e9d45e06cf829e010a927f973d98830105c3aca58a86be7a172974861 +$(DL_FILE)_BLAKE2 = 1eb8cc427bfe7cf5c52640d725d3c564b61fab85190ac516f7ac6245ac05f3202841f9059b62acc9f68ba8c63687b03dc636ea58e0f2341b76e815445c0f347e +location-$(DB_DATE).db.xz_BLAKE2 = 6def3003559dc1c6489ae4e9ea35cc69577687af26e7d0419f15daae1752d55137c855ed0397ed0c746255035c948f2e507db6543a4eaf1244e3bea9fab64742 install : $(TARGET) @@ -81,17 +81,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # https://lists.ipfire.org/pipermail/development/2022-November/014763.html cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.18-Revert-Install-Perl-files-to-Perl-vendor-directory.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.18_gettext-0.25_fix.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.18_Fix_backtracking_after_no_match_was_found_at_the_end_of_the_tree.patch cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-man-pages \ - --with-database-path=/var/lib/location/database.db \ - --without-systemd + --prefix=/usr \ + --libdir=/usr/lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-man-pages \ + --with-database-path=/var/lib/location/database.db \ + --without-systemd cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/libloc-0.9.18_Fix_backtracking_after_no_match_was_found_at_the_end_of_the_tree.patch b/src/patches/libloc-0.9.18_Fix_backtracking_after_no_match_was_found_at_the_end_of_the_tree.patch deleted file mode 100644 index 6ac9acf3c..000000000 --- a/src/patches/libloc-0.9.18_Fix_backtracking_after_no_match_was_found_at_the_end_of_the_tree.patch +++ /dev/null @@ -1,31 +0,0 @@ -X-Git-Url: http://git.ipfire.org/?p=location%2Flibloc.git;a=blobdiff_plain;f=src%2Fdatabase.c;h=c251061cc8a254879491ebe133b1b4f3b58ddf30;hp=0c8608542aaad6e82c4d8602bbeb388ab43225bb;hb=95d271bb90b4cebe81c288a95a2336aa63bac4d7;hpb=d1120513a30de43308d9ed848f7ef3c6ede6d767 - -diff --git a/src/database.c b/src/database.c -index 0c86085..c251061 100644 ---- a/src/database.c -+++ b/src/database.c -@@ -907,13 +907,7 @@ static int __loc_database_lookup(struct loc_database* db, const struct in6_addr* - - // Move on to the next node - r = __loc_database_lookup(db, address, network, network_address, node_index, level + 1); -- -- // End here if a result was found -- if (r == 0) -- return r; -- -- // Raise any errors -- else if (r < 0) -+ if (r < 0) - return r; - - DEBUG(db->ctx, "No match found below level %u\n", level); -@@ -922,7 +916,7 @@ static int __loc_database_lookup(struct loc_database* db, const struct in6_addr* - } - - // If this node has a leaf, we will check if it matches -- if (__loc_database_node_is_leaf(node_v1)) { -+ if (!*network && __loc_database_node_is_leaf(node_v1)) { - r = __loc_database_lookup_handle_leaf(db, address, network, network_address, level, node_v1); - if (r < 0) - return r; - diff --git a/src/patches/libloc-0.9.18_gettext-0.25_fix.patch b/src/patches/libloc-0.9.18_gettext-0.25_fix.patch deleted file mode 100644 index ad8d3c92a..000000000 --- a/src/patches/libloc-0.9.18_gettext-0.25_fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur libloc-0.9.18.orig/autogen.sh libloc-0.9.18/autogen.sh ---- libloc-0.9.18.orig/autogen.sh 2025-03-10 12:07:35.000000000 +0100 -+++ libloc-0.9.18/autogen.sh 2025-05-14 11:24:52.602116647 +0200 -@@ -8,8 +8,9 @@ - echo "Activated pre-commit hook." - fi - -+autopoint - intltoolize --force --automake --autoreconf --install --symlink -+autoreconf --force --install --symlink - - libdir() { - echo $(cd $1/$(gcc -print-multi-os-directory); pwd) -diff -Naur libloc-0.9.18.orig/configure.ac libloc-0.9.18/configure.ac ---- libloc-0.9.18.orig/configure.ac 2025-03-10 12:07:35.000000000 +0100 -+++ libloc-0.9.18/configure.ac 2025-05-14 11:25:45.712783931 +0200 -@@ -30,7 +30,10 @@ - AC_PREFIX_DEFAULT([/usr]) - gl_LD_VERSION_SCRIPT - --IT_PROG_INTLTOOL([0.40.0]) -++AM_GNU_GETTEXT_VERSION(0.25) -++AM_GNU_GETTEXT([external]) -+ -+IT_PROG_INTLTOOL([0.51.0]) - - # Interpret embedded Python in HTML files - XGETTEXT="${XGETTEXT} -L Python --keyword=_:1,2 --keyword=N_:1,2 --no-location"