Location December 2019

location@lists.ipfire.org

2 participants
5 discussions

Re: [PATCH] Makefile: Build debian packages in own directory.
by Michael Tremer 11 Dec '19

11 Dec '19

Hey, I can get behind this patch although it is quite ugly. The directory is left after the build has completed and should at least be included in .gitignore as well as being removed on make clean. Can you edit the patch accordingly? -Michael > On 11 Dec 2019, at 15:49, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote: > > This helps to keep a much cleaner environment. > > Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> > --- > Makefile.am | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/Makefile.am b/Makefile.am > index 1b9d90e..bf1dde1 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -421,4 +421,8 @@ $(DEBIAN_TARBALL_NAME): dist > > .PHONY: debian > debian: $(DEBIAN_TARBALL_NAME) > - debuild -i -us -uc -b > + mkdir -pv debian-build/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian > + cp -avf $(DEBIAN_TARBALL_NAME) debian-build > + cp -avf debian/* debian-build/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian > + cd debian-build && tar -xvf $(DEBIAN_TARBALL_NAME) > + cd debian-build/$(PACKAGE_NAME)-$(PACKAGE_VERSION) && debuild -us -uc > -- > 2.20.1

1 0

[PATCH] Makefile: Build debian packages in own directory.
by Stefan Schantl 11 Dec '19

11 Dec '19

This helps to keep a much cleaner environment. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1b9d90e..bf1dde1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -421,4 +421,8 @@ $(DEBIAN_TARBALL_NAME): dist .PHONY: debian debian: $(DEBIAN_TARBALL_NAME) - debuild -i -us -uc -b + mkdir -pv debian-build/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian + cp -avf $(DEBIAN_TARBALL_NAME) debian-build + cp -avf debian/* debian-build/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian + cd debian-build && tar -xvf $(DEBIAN_TARBALL_NAME) + cd debian-build/$(PACKAGE_NAME)-$(PACKAGE_VERSION) && debuild -us -uc -- 2.20.1

1 0

[PATCH] perl: Add get_continent_code()
by Stefan Schantl 11 Dec '19

11 Dec '19

This function allows to get the continent code by a given country code. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/perl/Location.xs | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/perl/Location.xs b/src/perl/Location.xs index 02dff7d..5693744 100644 --- a/src/perl/Location.xs +++ b/src/perl/Location.xs @@ -166,6 +166,31 @@ lookup_asn(db, address) OUTPUT: RETVAL +# +# Get functions +# +SV* +get_continent_code(db, ccode) + struct loc_database* db; + char* ccode; + + CODE: + RETVAL = &PL_sv_undef; + + // Lookup country code + struct loc_country *country; + int err = loc_database_get_country(db, &country, ccode); + if(!err) { + //Extract the continent code for the given country code. + const char* continent_code = loc_country_get_continent_code(country); + RETVAL = newSVpv(continent_code, strlen(continent_code)); + + loc_country_unref(country); + } + + OUTPUT: + RETVAL + void DESTROY(db) struct loc_database* db; -- 2.20.1

1 0

[PATCH] location-exporter: Allow exporting by family
by Stefan Schantl 09 Dec '19

09 Dec '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/python/location-exporter.in | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/python/location-exporter.in b/src/python/location-exporter.in index 421ed02..3074b90 100644 --- a/src/python/location-exporter.in +++ b/src/python/location-exporter.in @@ -177,8 +177,8 @@ class Exporter(object): self.db = db self.writer = writer - def export(self, directory, countries, asns): - for family in (socket.AF_INET6, socket.AF_INET): + def export(self, directory, families, countries, asns): + for family in families: log.debug("Exporting family %s" % family) writers = {} @@ -242,6 +242,9 @@ class CLI(object): # directory parser.add_argument("--directory", help=_("Output directory"), required=True) + # family + parser.add_argument("--family", help=_("Specify address family"), choices=("ipv6", "ipv4")) + # Countries and Autonomous Systems parser.add_argument("objects", nargs="+") @@ -270,6 +273,14 @@ class CLI(object): def handle_export(self, ns): countries, asns = [], [] + # Translate family + if ns.family == "ipv6": + families = [ socket.AF_INET6 ] + elif ns.family == "ipv4": + families = [ socket.AF_INET ] + else: + families = [ socket.AF_INET6, socket.AF_INET ] + for object in ns.objects: if object.startswith("AS"): try: @@ -299,7 +310,7 @@ class CLI(object): assert writer e = Exporter(db, writer) - e.export(ns.directory, countries=countries, asns=asns) + e.export(ns.directory, countries=countries, asns=asns, families=families) def main(): -- 2.20.1

2 1

[PATCH] debian: Install location-exporter
by Stefan Schantl 06 Dec '19

06 Dec '19

This binary has no manpage yet, so lintian will provide a warning of the non existing manpage. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- debian/libloc.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libloc.install b/debian/libloc.install index 55567b1..bc05c02 100644 --- a/debian/libloc.install +++ b/debian/libloc.install @@ -1,4 +1,5 @@ usr/bin/location-downloader +usr/bin/location-exporter usr/bin/location-query usr/lib/*/libloc.so.* usr/lib/python3*/*-packages/*.so -- 2.20.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

Location December 2019