0.9.19 bump

diff --git a/.gitignore b/.gitignore
index 9fdb99b43e5489999b6d4b271596aa0f04fcf001..c0289c72b2ab01b4eb5cc22febdf6b1ed7d7b97e 100644 (file)
--- 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.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 (file)
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 <michael.tremer@ipfire.org>
-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 <michael.tremer@ipfire.org>
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- 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 5e50ccbf28a67fc0b3e6499a7a670c9ce4ec11e2..b6f764fcef098506bddbbc86b35729b87039731d 100644 (file)
--- a/libloc.spec
+++ b/libloc.spec
@@ -1,6 +1,6 @@
 Name:       libloc
 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
 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
 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
 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:  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
 # 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
 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
 # 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
 %{_datadir}/bash-completion/completions/location
 
 %changelog

+* Wed Jun 03 2026 Petr Pisar <ppisar@redhat.com> - 0.9.19-1
+- 0.9.19 bump
+

 * Thu Apr 16 2026 Tom Callaway <spot@fedoraproject.org> - 0.9.18-9
 - rebuild
 
 * Thu Apr 16 2026 Tom Callaway <spot@fedoraproject.org> - 0.9.18-9
 - rebuild
 

diff --git a/sources b/sources
index 1f5d77a3b824be0fc88692f7302220f6b42f991a..4bcc46562ef4a6e44bcc82b6ef28d1b2dd277c9f 100644 (file)
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libloc-0.9.18.tar.gz) = 922e3c9748f9858e5f1567b2ad4e41c3e812a05cb4ca7a517d59d9272f082a4655d502b0415d6efbd7e8fb1f3d938c47964a1e187ee97163f434f70ba9418de3
+SHA512 (libloc-0.9.19.tar.gz) = f3f4eaa049f61da13886b48ae7742d20233805ea02cde2ea011bb52279dffcf8307f8598cf35e60d6c38bcdd52ba287f18ab39198132758249c5dc71d6aba1ba