From 6bbd37183a62d08a01ba116c6248230b84a314e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 3 Jun 2026 11:43:35 +0200 Subject: [PATCH] 0.9.19 bump --- .gitignore | 1 + ...aness-problem-when-fetching-octets-i.patch | 36 ------------------- libloc.spec | 13 +++---- sources | 2 +- 4 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 libloc-0.9.18-address-Fix-endianess-problem-when-fetching-octets-i.patch diff --git a/.gitignore b/.gitignore index 9fdb99b..c0289c7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libloc-0.9.16.tar.gz /libloc-0.9.17.tar.gz /libloc-0.9.18.tar.gz +/libloc-0.9.19.tar.gz diff --git a/libloc-0.9.18-address-Fix-endianess-problem-when-fetching-octets-i.patch b/libloc-0.9.18-address-Fix-endianess-problem-when-fetching-octets-i.patch deleted file mode 100644 index a2c866a..0000000 --- a/libloc-0.9.18-address-Fix-endianess-problem-when-fetching-octets-i.patch +++ /dev/null @@ -1,36 +0,0 @@ -From afc5330f56d74b4a9142b800d994d623d7cd29e8 Mon Sep 17 00:00:00 2001 -From: Michael Tremer -Date: Mon, 10 Mar 2025 15:13:07 +0000 -Subject: [PATCH] address: Fix endianess problem when fetching octets in IPv4 - addresses -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: #13828 -Signed-off-by: Michael Tremer -Signed-off-by: Petr Písař ---- - src/libloc/address.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/libloc/address.h b/src/libloc/address.h -index ff6e943..e85d761 100644 ---- a/src/libloc/address.h -+++ b/src/libloc/address.h -@@ -324,7 +324,11 @@ static inline int loc_address_get_octet(const struct in6_addr* address, const un - if (i >= 4) - return -ERANGE; - -- return (address->s6_addr32[3] >> (i * 8)) & 0xff; -+ // Format the IPv4 in host-byte order -+ unsigned int a4 = be32toh(address->s6_addr32[3]); -+ -+ // Return the nth byte from the left -+ return a4 >> ((3 - i) * 8) & 0xff; - - } else { - if (i >= 32) --- -2.48.1 - diff --git a/libloc.spec b/libloc.spec index 5e50ccb..b6f764f 100644 --- a/libloc.spec +++ b/libloc.spec @@ -1,6 +1,6 @@ Name: libloc -Version: 0.9.18 -Release: 9%{?dist} +Version: 0.9.19 +Release: 1%{?dist} Summary: Library to determine a location of an IP address in the Internet # bash-completion/location: LGPL-2.1-or-later # COPYING: LGPL-2.1 text @@ -94,9 +94,6 @@ License: LGPL-2.1-or-later SourceLicense: LGPL-2.1-or-later AND CC-BY-SA-4.0 AND (GPL-1.0-or-later OR Artistic-1.0-Perl) AND GPL-2.0-or-later AND GPL-2.0-or-later WITH Autoconf-exception-macro AND FSFAP AND FSFULLR URL: https://location.ipfire.org/ Source0: https://source.ipfire.org/releases/%{name}/%{name}-%{version}.tar.gz -# Fix endianess when fetching octets from an IPv4 address, -# upstream bug #13828, in upstream after 0.9.18 -Patch0: libloc-0.9.18-address-Fix-endianess-problem-when-fetching-octets-i.patch BuildRequires: asciidoc BuildRequires: autoconf >= 2.60 # autoconf-archive for unbundled m4/ax_prog_perl_modules.m4 @@ -108,6 +105,7 @@ BuildRequires: coreutils BuildRequires: docbook-style-xsl BuildRequires: findutils BuildRequires: gcc +BuildRequires: gettext-devel >= 0.21 # grep is called from po/Makefile supplied with intltool BuildRequires: grep # gnulib-devel for unbundled m4/ld-version-script.m4 @@ -214,7 +212,7 @@ This package implements Bash completion scripts for IPFire location tools. rm m4/ax_prog_perl_modules.m4 m4/ld-version-script.m4 %build -autoreconf -fi -I%{_datadir}/gnulib/m4 +autoreconf -fi -I%{_datadir}/gettext/m4 -I%{_datadir}/gnulib/m4 # Upstream moved to /var/lib/location/database.db in # 14e821d483017d86d9e12486c9d9a289f4e99b0e. %global default_database_file %{_sharedstatedir}/location/database.db @@ -317,6 +315,9 @@ make check %{?_smp_mflags} || (cat ./test-suite.log; exit 1) %{_datadir}/bash-completion/completions/location %changelog +* Wed Jun 03 2026 Petr Pisar - 0.9.19-1 +- 0.9.19 bump + * Thu Apr 16 2026 Tom Callaway - 0.9.18-9 - rebuild diff --git a/sources b/sources index 1f5d77a..4bcc465 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libloc-0.9.18.tar.gz) = 922e3c9748f9858e5f1567b2ad4e41c3e812a05cb4ca7a517d59d9272f082a4655d502b0415d6efbd7e8fb1f3d938c47964a1e187ee97163f434f70ba9418de3 +SHA512 (libloc-0.9.19.tar.gz) = f3f4eaa049f61da13886b48ae7742d20233805ea02cde2ea011bb52279dffcf8307f8598cf35e60d6c38bcdd52ba287f18ab39198132758249c5dc71d6aba1ba -- 2.47.3