From: Petr Písař Date: Mon, 31 Oct 2022 15:53:23 +0000 (+0100) Subject: 0.9.16 bump X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37dc75c7a3a4418c427577c41767dd2888007d7b;p=location%2Ffedora%2Flibloc.git 0.9.16 bump --- diff --git a/.gitignore b/.gitignore index 25b5af7..8c06979 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libloc-0.9.15.tar.gz +/libloc-0.9.16.tar.gz diff --git a/libloc-0.9.15-Declare-make-dependencies-for-Perl-binding.patch b/libloc-0.9.15-Declare-make-dependencies-for-Perl-binding.patch deleted file mode 100644 index 66aaef5..0000000 --- a/libloc-0.9.15-Declare-make-dependencies-for-Perl-binding.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 83281d3835a995a03c0b10029e632723a4642431 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 19 Oct 2022 11:50:23 +0200 -Subject: [PATCH] Declare make dependencies for Perl binding -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Running make in parallel (make -j5) randomly failed with: - -/bin/sh ./libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -include ./config.h -DSYSCONFDIR=\""/etc"\" -I./src -Wall -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wshadow -Wsign-compare -Wstrict-prototypes -Wtype-limits -fno-semantic-interposition -ffunction-sections -fdata-sections -DLIBLOC_PRIVATE -fvisibility=hidden -g -O2 -c -o src/libloc_internal_la-database.lo `test -f 'src/database.c' || echo './'`src/database.c -/usr/bin/ld: cannot find -lloc: No such file or directory -collect2: error: ld returned 1 exit status -make[3]: *** [Makefile:482: blib/arch/auto/Location/Location.so] Error 1 -make[2]: *** [Makefile:2982: build-perl] Error 2 - -That's because build-perl did not depend on libloc library. - -A similar issue was with running tests and installing files. Moreover, -thess two targets rebuilt Perl binding from scratch. - -This patch make the dependencies explicit and turns build-perl into -non-PHONY. - -Signed-off-by: Petr Písař ---- - Makefile.am | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 4a09d78..163c1a3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -232,8 +232,7 @@ EXTRA_DIST += \ - src/perl/t/Location.t \ - src/perl/typemap - --.PHONY: build-perl --build-perl: -+build-perl: src/libloc.la - @mkdir -p $(builddir)/src/perl/{lib,t} - @test -e $(builddir)/src/perl/Location.xs || ln -s --relative $(srcdir)/src/perl/Location.xs $(builddir)/src/perl/ - @test -e $(builddir)/src/perl/MANIFEST || ln -s --relative $(srcdir)/src/perl/MANIFEST $(builddir)/src/perl/ -@@ -246,19 +245,21 @@ build-perl: - INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 \ - INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc" - cd $(builddir)/src/perl && $(MAKE) -+ touch build-perl - - .PHONY: check-perl --check-perl: testdata.db -+check-perl: testdata.db build-perl - cd $(builddir)/src/perl && $(MAKE) LD_LIBRARY_PATH="$(abs_builddir)/src/.libs" test \ - database="../../$<" keyfile="$(abs_srcdir)/examples/public-key.pem" - - .PHONY: install-perl --install-perl: -+install-perl: build-perl - cd $(builddir)/src/perl && $(MAKE) install DESTIDR=$(DESTDIR) - - .PHONY: clean-perl - clean-perl: - cd $(builddir)/src/perl && $(MAKE) distclean -+ rm build-perl - - .PHONY: uninstall-perl - uninstall-perl: --- -2.37.3 - diff --git a/libloc-0.9.15-Install-Perl-files-to-Perl-vendor-directory.patch b/libloc-0.9.15-Install-Perl-files-to-Perl-vendor-directory.patch deleted file mode 100644 index d9b4f68..0000000 --- a/libloc-0.9.15-Install-Perl-files-to-Perl-vendor-directory.patch +++ /dev/null @@ -1,36 +0,0 @@ -From afca2e0632e78227b2a18506e64d4a1b5cd1e1a1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 4 Oct 2022 13:51:21 +0200 -Subject: [PATCH] Install Perl files to Perl vendor directory -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On Fedora, the original code placed files into /usr/lib64/perl5/5.36/. -That location is not recognized by Fedora perl. - -This patch also adds NO_PACKLIST=1 NO_PERLLOCAL=1 not to create -unnecessary files incomopatible with a RPM-driver software distribution. - -Signed-off-by: Petr Písař ---- - Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index ec737d0..ca37166 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -242,7 +242,8 @@ build-perl: - @test -e $(builddir)/src/perl/t/Location.t || ln -s --relative $(srcdir)/src/perl/t/Location.t $(builddir)/src/perl/t/ - @test -e $(builddir)/src/perl/typemap || ln -s --relative $(srcdir)/src/perl/typemap $(builddir)/src/perl/ - -- cd $(builddir)/src/perl && $(PERL) Makefile.PL PREFIX="$(prefix)" \ -+ cd $(builddir)/src/perl && $(PERL) Makefile.PL \ -+ INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 \ - INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc" - cd $(builddir)/src/perl && $(MAKE) LD_RUN_PATH= - --- -2.37.3 - diff --git a/libloc-0.9.15-Makefile-Reset-Python-path.patch b/libloc-0.9.15-Makefile-Reset-Python-path.patch deleted file mode 100644 index 07c256f..0000000 --- a/libloc-0.9.15-Makefile-Reset-Python-path.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bed4777fc99494854335a90c5a6e7fc2e30edf4d Mon Sep 17 00:00:00 2001 -From: Michael Tremer -Date: Sat, 1 Oct 2022 11:56:31 +0000 -Subject: [PATCH] Makefile: Reset Python path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Michael Tremer -Signed-off-by: Petr Písař ---- - Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 81bd992..ec737d0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,8 +56,7 @@ databasedir = $(localstatedir)/lib/location - pkgconfigdir = $(libdir)/pkgconfig - - # Overwrite Python path --#pkgpythondir = $(pythondir)/location --pkgpythondir = /usr/lib/python3/dist-packages/location -+pkgpythondir = $(pythondir)/location - - %: %.in Makefile - $(SED_PROCESS) --- -2.37.3 - diff --git a/libloc-0.9.15-Move-location-manual-from-section-8-to-section-1.patch b/libloc-0.9.15-Move-location-manual-from-section-8-to-section-1.patch deleted file mode 100644 index 71cbd9c..0000000 --- a/libloc-0.9.15-Move-location-manual-from-section-8-to-section-1.patch +++ /dev/null @@ -1,82 +0,0 @@ -From d6f4e551d3e398a2187c5c65f47d9a34b4a69ca9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 6 Oct 2022 13:28:51 +0200 -Subject: [PATCH] Move location manual from section 8 to section 1 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It's a tool a non-superuser can use. It's installed into /usr/bin. - -Signed-off-by: Petr Písař ---- - Makefile.am | 12 ++++++------ - man/libloc.txt | 2 +- - man/location.txt | 2 +- - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 0d469d4..4a09d78 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -444,7 +444,7 @@ src_test_address_LDADD = \ - - MANPAGES = \ - $(MANPAGES_3) \ -- $(MANPAGES_8) -+ $(MANPAGES_1) - - MANPAGES_3 = \ - man/libloc.3 \ -@@ -458,12 +458,12 @@ MANPAGES_3 = \ - man/loc_set_log_fn.3 \ - man/loc_set_log_priority.3 - --MANPAGES_8 = \ -- man/location.8 -+MANPAGES_1 = \ -+ man/location.1 - --MANPAGES_TXT = $(MANPAGES_TXT_3) $(MANPAGES_TXT_8) -+MANPAGES_TXT = $(MANPAGES_TXT_3) $(MANPAGES_TXT_1) - MANPAGES_TXT_3 = $(patsubst %.3,%.txt,$(MANPAGES_3)) --MANPAGES_TXT_8 = $(patsubst %.8,%.txt,$(MANPAGES_8)) -+MANPAGES_TXT_1 = $(patsubst %.1,%.txt,$(MANPAGES_1)) - MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES_TXT)) - MANPAGES_XML = $(patsubst %.txt,%.xml,$(MANPAGES_TXT)) - -@@ -511,7 +511,7 @@ man/%.xml: man/%.txt man/asciidoc.conf - man/%.3: man/%.xml - $(XSLTPROC_COMMAND_MAN) - --man/%.8: man/%.xml -+man/%.1: man/%.xml - $(XSLTPROC_COMMAND_MAN) - - man/%.html: man/%.txt man/asciidoc.conf -diff --git a/man/libloc.txt b/man/libloc.txt -index baf98c1..ec14e16 100644 ---- a/man/libloc.txt -+++ b/man/libloc.txt -@@ -39,7 +39,7 @@ either version 2.1 of the License, or (at your option) any later version. - - == See Also - --link:location[8] -+link:location[1] - - == Bug Reports - -diff --git a/man/location.txt b/man/location.txt -index 3dfddf5..70352d2 100644 ---- a/man/location.txt -+++ b/man/location.txt -@@ -1,4 +1,4 @@ --= location(8) -+= location(1) - - == NAME - location - Query the location database --- -2.37.3 - diff --git a/libloc-0.9.15-Remove-shebangs-from-Python-modules.patch b/libloc-0.9.15-Remove-shebangs-from-Python-modules.patch deleted file mode 100644 index 5a647b2..0000000 --- a/libloc-0.9.15-Remove-shebangs-from-Python-modules.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 61042cee994479d768649e75c08102bd6252773d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 4 Oct 2022 16:16:07 +0200 -Subject: [PATCH] Remove shebangs from Python modules -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Shebangs only belong to standalone executables. - -Signed-off-by: Petr Písař ---- - src/python/location/__init__.py | 1 - - src/python/location/database.py | 2 -- - src/python/location/downloader.py | 1 - - src/python/location/export.py | 1 - - src/python/location/i18n.py | 1 - - src/python/location/importer.py | 1 - - src/python/location/logger.py | 1 - - 7 files changed, 8 deletions(-) - -diff --git a/src/python/location/__init__.py b/src/python/location/__init__.py -index 5d6710d..e0ba510 100644 ---- a/src/python/location/__init__.py -+++ b/src/python/location/__init__.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python3 - ############################################################################### - # # - # libloc - A library to determine the location of someone on the Internet # -diff --git a/src/python/location/database.py b/src/python/location/database.py -index 5d79941..b97d93a 100644 ---- a/src/python/location/database.py -+++ b/src/python/location/database.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - """ - A lightweight wrapper around psycopg2. - -diff --git a/src/python/location/downloader.py b/src/python/location/downloader.py -index b9e0c22..3618968 100644 ---- a/src/python/location/downloader.py -+++ b/src/python/location/downloader.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python3 - ############################################################################### - # # - # libloc - A library to determine the location of someone on the Internet # -diff --git a/src/python/location/export.py b/src/python/location/export.py -index 3f58498..25a532e 100644 ---- a/src/python/location/export.py -+++ b/src/python/location/export.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python3 - ############################################################################### - # # - # libloc - A library to determine the location of someone on the Internet # -diff --git a/src/python/location/i18n.py b/src/python/location/i18n.py -index 2161aa6..c97c51c 100644 ---- a/src/python/location/i18n.py -+++ b/src/python/location/i18n.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python3 - ############################################################################### - # # - # libloc - A library to determine the location of someone on the Internet # -diff --git a/src/python/location/importer.py b/src/python/location/importer.py -index 96f2218..d285162 100644 ---- a/src/python/location/importer.py -+++ b/src/python/location/importer.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python3 - ############################################################################### - # # - # libloc - A library to determine the location of someone on the Internet # -diff --git a/src/python/location/logger.py b/src/python/location/logger.py -index 0bdf9ec..62ad8fb 100644 ---- a/src/python/location/logger.py -+++ b/src/python/location/logger.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python3 - ############################################################################### - # # - # libloc - A library to determine the location of someone on the Internet # --- -2.37.3 - diff --git a/libloc-0.9.15-Revert-perl-Remove-RPATH.patch b/libloc-0.9.15-Revert-perl-Remove-RPATH.patch deleted file mode 100644 index 7ecc6fd..0000000 --- a/libloc-0.9.15-Revert-perl-Remove-RPATH.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3101c388bd5cd1032a95c38c4191b26d647c0677 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 4 Oct 2022 14:10:58 +0200 -Subject: [PATCH] Revert "perl: Remove RPATH" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit fb574759cbd3a60e64ed2674f514037b9085f078 because -LD_RUN_PATH='' creates empty DT_RPATH/DT_RUNPATH record. Fedora -requires no record. rpmbuild fails with: - -ERROR 0010: file '/usr/lib64/perl5/5.36/auto/Location/Location.so' contains an empty runpath in [] - -Signed-off-by: Petr Písař ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index ca37166..0d469d4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -245,7 +245,7 @@ build-perl: - cd $(builddir)/src/perl && $(PERL) Makefile.PL \ - INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 \ - INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc" -- cd $(builddir)/src/perl && $(MAKE) LD_RUN_PATH= -+ cd $(builddir)/src/perl && $(MAKE) - - .PHONY: check-perl - check-perl: testdata.db --- -2.37.3 - diff --git a/libloc.spec b/libloc.spec index 8d0559a..527aa4c 100644 --- a/libloc.spec +++ b/libloc.spec @@ -1,8 +1,9 @@ Name: libloc -Version: 0.9.15 -Release: 2%{?dist} +Version: 0.9.16 +Release: 1%{?dist} Summary: Library to determine a location of an IP address in the Internet # COPYING: LGPL-2.1 text +# data/database.db: CC-BY-SA-4.0 # man/libloc.txt: LGPL-2.1-or-later # po/de.po: "same as libloc" # src/address.c: LGPL-2.1-or-later @@ -66,7 +67,6 @@ Summary: Library to determine a location of an IP address in the Internet # src/test-network-list.c: GPL-2.0-or-later # src/test-signature.c: GPL-2.0-or-later # src/test-stringpool.c: GPL-2.0-or-later -# tests/data/location-2022-03-30.db: CC-BY-SA-4.0 ## Unbundled, then used only at build-time, not in any binary package # m4/ax_prog_perl_modules.m4: FSFAP # m4/ld-version-script.m4: FSFULLR @@ -76,23 +76,6 @@ Summary: Library to determine a location of an IP address in the Internet License: LGPL-2.1-or-later URL: https://location.ipfire.org/ Source0: https://source.ipfire.org/releases/%{name}/%{name}-%{version}.tar.gz -# Install Python files into site Python module path, in upstream after 0.9.15 -Patch0: libloc-0.9.15-Makefile-Reset-Python-path.patch -# Install Perl files vendor Perl module path, in upstream after 0.9.15, -# -Patch1: libloc-0.9.15-Install-Perl-files-to-Perl-vendor-directory.patch -# Remove empty RPATH, in upstream after 0.9.15, -# -Patch2: libloc-0.9.15-Revert-perl-Remove-RPATH.patch -# Remove shebangs from Python modules, in upstream after 0.9.15, -# -Patch3: libloc-0.9.15-Remove-shebangs-from-Python-modules.patch -# Move location(8) to location(1), in upstream after 0.9.15, -# -Patch4: libloc-0.9.15-Move-location-manual-from-section-8-to-section-1.patch -# Fix make dependencies for Perl, in upstream after 0.9.15, -# -Patch5: libloc-0.9.15-Declare-make-dependencies-for-Perl-binding.patch BuildRequires: asciidoc BuildRequires: autoconf >= 2.60 # autoconf-archive for unbundled m4/ax_prog_perl_modules.m4 @@ -117,6 +100,7 @@ BuildRequires: openssl-devel BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl-interpreter +BuildRequires: perl(Config) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: pkgconf-m4 # pkgconf-pkg-config for pkg-config program @@ -159,6 +143,7 @@ location in the Internet. %package -n python3-%{name} Summary: Python interface to libloc library +License: LGPL-2.1-or-later AND CC-BY-SA-4.0 %py_provides python3-location %description -n python3-%{name} @@ -263,11 +248,12 @@ make check %{?_smp_mflags} %{python3_sitelib}/location %{python3_sitelib}/%{name}-%{version}.dist-info %{python3_sitearch}/_location.so -# TODO: writable for a dedicated, non-root user # The default path is compiled into _location.so Python module. Not into # C libloc.so. Thus the database belongs here, to Python package. -%{_sharedstatedir}/location -%ghost %attr(0444, root, root) %{default_database_file} +%dir %{_sharedstatedir}/location +%{_sharedstatedir}/location/signing-key.pem +# User can update the database later from the Internet. +%attr(0444, root, root) %verify(not size filedigest mtime) %{default_database_file} %files tools %{_bindir}/location* @@ -275,6 +261,10 @@ make check %{?_smp_mflags} %{_unitdir}/* %changelog +* Mon Oct 31 2022 Petr Pisar - 0.9.16-1 +- 0.9.16 bump +- A database snapshot from 2022-10-20T06:27:23 is included + * Wed Oct 19 2022 Petr Pisar - 0.9.15-2 - Enable enabling debuging messages - Fix make dependencies for Perl diff --git a/sources b/sources index 147b6a1..55cf5b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libloc-0.9.15.tar.gz) = aee14c4a1feba201b2b353ce919c6b2a04f80647ac9b632adf368eb9fc32da2d2a5010b52a700428f25bef21cb39e4657d055b0c028e8d7dd8ba271730fdfddd +SHA512 (libloc-0.9.16.tar.gz) = 4a4800d8638244917de8f41d75aff289b60b35e8c5b9546e68f78aab29b2f05d0db383b8403bf93a0e0fdf3916e56eb4f8b10fd9771826d85d49bc7b4917558b