mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 03:33:25 +02:00
libloc: Update to 0.9.16
https://lists.ipfire.org/pipermail/location/2022-October/000602.html Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
This commit is contained in:
Peter Müller
18
lfs/libloc
18
lfs/libloc
@@ -1,7 +1,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# #
|
# #
|
||||||
# IPFire.org - A linux based firewall #
|
# IPFire.org - A linux based firewall #
|
||||||
# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
|
# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# This program is free software: you can redistribute it and/or modify #
|
||||||
# it under the terms of the GNU General Public License as published by #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
@@ -24,8 +24,8 @@
|
|||||||
|
|
||||||
include Config
|
include Config
|
||||||
|
|
||||||
VER = 0.9.15
|
VER = 0.9.16
|
||||||
DB_DATE = 2022-10-15
|
DB_DATE = 2023-01-30
|
||||||
|
|
||||||
THISAPP = libloc-$(VER)
|
THISAPP = libloc-$(VER)
|
||||||
DL_FILE = $(THISAPP).tar.gz
|
DL_FILE = $(THISAPP).tar.gz
|
||||||
@@ -43,8 +43,8 @@ objects = $(DL_FILE) \
|
|||||||
$(DL_FILE) = https://source.ipfire.org/releases/libloc/$(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.xz
|
location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz
|
||||||
|
|
||||||
$(DL_FILE)_BLAKE2 = f3db0fc75ac930805f0df2892b00ffb8f31123a5f28a8cade78f8f1614c0cd806ea365810c5192720d067531b199c342a2c6039f3cd5370c4c9efeded4e31857
|
$(DL_FILE)_BLAKE2 = dc9e5ce8e1084e6a385149521f5f5ea156f33502343b254b9f70c5c6e28f699466981ae704483681a80449c2acfd202301bcbcfc2b81d773c308575910db79e9
|
||||||
location-$(DB_DATE).db.xz_BLAKE2 = b34b554923a8291ea60ec34c98609da1d71aab66bc1aa2f973ea2e6fd14b6f750559d1e9365df4dd3f707a8dce373aba5f79381c61a4953f272b3557be88af2c
|
location-$(DB_DATE).db.xz_BLAKE2 = c3746c6b564d9115f1a5562500c1ebe01fb6fbd1d1ec68705dc7f788594a480e0fb8aec218942c637ac07a252c776ae4d786379254f6f2609eb41b737e10c5d5
|
||||||
|
|
||||||
install : $(TARGET)
|
install : $(TARGET)
|
||||||
|
|
||||||
@@ -78,15 +78,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
|||||||
@$(PREBUILD)
|
@$(PREBUILD)
|
||||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
|
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
|
||||||
|
|
||||||
# https://lists.ipfire.org/pipermail/location/2022-October/000596.html
|
# https://lists.ipfire.org/pipermail/development/2022-November/014763.html
|
||||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.15-Makefile-reset-Python-path.patch
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.16-Revert-Install-Perl-files-to-Perl-vendor-directory.patch
|
||||||
|
|
||||||
# https://bugzilla.ipfire.org/show_bug.cgi?id=12944
|
|
||||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.15-export-Fix-generating-file-names-for-ipset-output.patch
|
|
||||||
|
|
||||||
cd $(DIR_APP) && ./autogen.sh
|
cd $(DIR_APP) && ./autogen.sh
|
||||||
cd $(DIR_APP) && ./configure \
|
cd $(DIR_APP) && ./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
|
--libdir=/usr/lib \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--localstatedir=/var \
|
--localstatedir=/var \
|
||||||
--disable-man-pages \
|
--disable-man-pages \
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
commit bed4777fc99494854335a90c5a6e7fc2e30edf4d
|
|
||||||
Author: Michael Tremer <michael.tremer@ipfire.org>
|
|
||||||
Date: Sat Oct 1 11:56:31 2022 +0000
|
|
||||||
|
|
||||||
Makefile: Reset Python path
|
|
||||||
|
|
||||||
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
|
|
||||||
|
|
||||||
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)
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
commit cd214f295797e5cc8dbc296753924863b33ab8bd
|
|
||||||
Author: Michael Tremer <michael.tremer@ipfire.org>
|
|
||||||
Date: Tue Oct 4 08:47:03 2022 +0000
|
|
||||||
|
|
||||||
export: Fix generating file names for ipset output
|
|
||||||
|
|
||||||
The tag that is being used in the filename was set after creating the
|
|
||||||
filename. The order has now been fixed and the export works fine for me.
|
|
||||||
|
|
||||||
Fixes: #12944
|
|
||||||
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
|
|
||||||
|
|
||||||
diff --git a/src/python/location/export.py b/src/python/location/export.py
|
|
||||||
index f5ed37f..3f58498 100644
|
|
||||||
--- a/src/python/location/export.py
|
|
||||||
+++ b/src/python/location/export.py
|
|
||||||
@@ -48,6 +48,9 @@ class OutputWriter(object):
|
|
||||||
self.family = family
|
|
||||||
self.directory = directory
|
|
||||||
|
|
||||||
+ # Tag
|
|
||||||
+ self.tag = self._make_tag()
|
|
||||||
+
|
|
||||||
# Open output file
|
|
||||||
if f:
|
|
||||||
self.f = f
|
|
||||||
@@ -58,9 +61,6 @@ class OutputWriter(object):
|
|
||||||
else:
|
|
||||||
self.f = io.StringIO()
|
|
||||||
|
|
||||||
- # Tag
|
|
||||||
- self.tag = self._make_tag()
|
|
||||||
-
|
|
||||||
# Call any custom initialization
|
|
||||||
self.init()
|
|
||||||
|
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
From e80f2517a230b73b1de554e6fe19e81947c2b665 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Peter=20M=C3=BCller?= <peter.mueller@ipfire.org>
|
||||||
|
Date: Tue, 31 Jan 2023 10:04:31 +0000
|
||||||
|
Subject: [PATCH] Revert "Install Perl files to Perl vendor directory"
|
||||||
|
|
||||||
|
This reverts commit b26c2109eaf229d8c297266f12cd4757d7f14eb8.
|
||||||
|
---
|
||||||
|
Makefile.am | 17 ++++++++---------
|
||||||
|
configure.ac | 12 +-----------
|
||||||
|
2 files changed, 9 insertions(+), 20 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
|
index 7f0d8d0..049832f 100644
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -241,8 +241,7 @@ build-perl: src/libloc.la
|
||||||
|
@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 NO_PACKLIST=1 NO_PERLLOCAL=1 \
|
||||||
|
- INSTALLDIRS=vendor \
|
||||||
|
+ cd $(builddir)/src/perl && $(PERL) Makefile.PL PREFIX="$(prefix)" \
|
||||||
|
INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc"
|
||||||
|
cd $(builddir)/src/perl && $(MAKE)
|
||||||
|
touch build-perl
|
||||||
|
@@ -254,20 +253,20 @@ check-perl: testdata.db build-perl
|
||||||
|
|
||||||
|
.PHONY: install-perl
|
||||||
|
install-perl: build-perl
|
||||||
|
- cd $(builddir)/src/perl && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||||
|
+ cd $(builddir)/src/perl && $(MAKE) install DESTIDR=$(DESTDIR)
|
||||||
|
|
||||||
|
.PHONY: clean-perl
|
||||||
|
clean-perl:
|
||||||
|
cd $(builddir)/src/perl && $(MAKE) distclean
|
||||||
|
- rm -f build-perl
|
||||||
|
+ rm build-perl
|
||||||
|
|
||||||
|
.PHONY: uninstall-perl
|
||||||
|
uninstall-perl:
|
||||||
|
- rm -vf \
|
||||||
|
- $(DESTDIR)/@PERL_MODPATH@/Location.pm \
|
||||||
|
- $(DESTDIR)/@PERL_MODPATH@/auto/Location/Location.so \
|
||||||
|
- $(DESTDIR)/@PERL_MANPATH@/Location.3pm
|
||||||
|
- -rmdir $(DESTDIR)/@PERL_MODPATH@/auto/Location
|
||||||
|
+ rm -rvf \
|
||||||
|
+ $(DESTDIR)/$(prefix)/lib/*/perl/*/Location.pm \
|
||||||
|
+ $(DESTDIR)/$(prefix)/lib/*/perl/*/auto/Location \
|
||||||
|
+ $(DESTDIR)/$(prefix)/lib/*/perl/*/perllocal.pod \
|
||||||
|
+ $(DESTDIR)/$(prefix)/man/man3/Location.3pm
|
||||||
|
|
||||||
|
bin_SCRIPTS = \
|
||||||
|
src/scripts/location \
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 96e6b0e..f6d30f7 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -175,18 +175,10 @@ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
|
||||||
|
AC_PATH_PROG(PERL, perl, no)
|
||||||
|
AC_SUBST(PERL)
|
||||||
|
|
||||||
|
-AX_PROG_PERL_MODULES(Config ExtUtils::MakeMaker,, AC_MSG_WARN(Need some Perl modules))
|
||||||
|
+AX_PROG_PERL_MODULES(ExtUtils::MakeMaker,, AC_MSG_WARN(Need some Perl modules))
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(perl, AS_HELP_STRING([--disable-perl], [do not build the perl modules]), [],[enable_perl=yes])
|
||||||
|
AM_CONDITIONAL(ENABLE_PERL, test "$enable_perl" = "yes")
|
||||||
|
-AS_IF([test "$enable_perl" = "yes"],
|
||||||
|
- [
|
||||||
|
- PERL_MODPATH=$($PERL -MConfig -e 'print $Config{installvendorarch}')
|
||||||
|
- PERL_MANPATH=$($PERL -MConfig -e 'print $Config{installvendorman3dir}')
|
||||||
|
- AC_SUBST(PERL_MODPATH)
|
||||||
|
- AC_SUBST(PERL_MANPATH)
|
||||||
|
- ],
|
||||||
|
-)
|
||||||
|
|
||||||
|
dnl Checking for libresolv
|
||||||
|
case "${host}" in
|
||||||
|
@@ -232,6 +224,4 @@ AC_MSG_RESULT([
|
||||||
|
|
||||||
|
Bindings:
|
||||||
|
Perl: ${enable_perl}
|
||||||
|
- Perl module path: ${PERL_MODPATH}
|
||||||
|
- Perl manual path: ${PERL_MANPATH}
|
||||||
|
])
|
||||||
|
--
|
||||||
|
2.35.3
|
||||||
|
|
||||||
Reference in New Issue
Block a user