Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] WIP: Geoip drop
@ 2020-12-26 10:56 fosslinux
  2021-01-18 21:25 ` mobinmob
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: fosslinux @ 2020-12-26 10:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 749 bytes --]

There is a new pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages geoip-drop
https://github.com/void-linux/void-packages/pull/27445

WIP: Geoip drop
1. `mirrorbits` does not compile -- no idea why, have tried quite a few things
2. `qomui`'s tests do not pass

@sgn one of the last noarch things

`geoip-data` been deprecated by upstream for 2 years now. Is noarch. Distfiles
are no longer found (can only be accessed behind a license). No packages
now use it after this PR. If someone really wants an up-to-date legacy database, they
can use geoipupdate (still included in the repo).

A patch file from https://github.com/void-linux/void-packages/pull/27445.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geoip-drop-27445.patch --]
[-- Type: text/x-diff, Size: 5225 bytes --]

From 5e0f120e4dde4addd4d9da1307484cf6b26b792d Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 26 Dec 2020 19:44:38 +1100
Subject: [PATCH 1/3] mirrorbits: drop legacy geoip.

Not supported by upstream anyways.
---
 srcpkgs/mirrorbits/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mirrorbits/template b/srcpkgs/mirrorbits/template
index d1d76406f86..ad167f451f2 100644
--- a/srcpkgs/mirrorbits/template
+++ b/srcpkgs/mirrorbits/template
@@ -1,14 +1,13 @@
 # Template file for 'mirrorbits'
 pkgname=mirrorbits
 version=0.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/etix/mirrorbits"
 go_ldflags="-X ${go_import_path}/core.VERSION=${VERSION}"
 _go_protobuf_version=52132540909e117f2b98b0694383dc0ab1e1deca
 hostmakedepends="govendor git pkg-config protobuf-devel protobuf"
-makedepends="geoip-devel"
-depends="geoip-data redis"
+depends="redis"
 short_desc="Geographical download redirector"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From f36d97effeee3f690d42b4af5425f901e65553fe Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 26 Dec 2020 19:55:46 +1100
Subject: [PATCH 2/3] qomui: drop geoip-data dependency.

README says it is optional. It isn't, but patching it out works too.
---
 srcpkgs/qomui/patches/geoip.patch | 15 +++++++++++++++
 srcpkgs/qomui/template            |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/qomui/patches/geoip.patch

diff --git a/srcpkgs/qomui/patches/geoip.patch b/srcpkgs/qomui/patches/geoip.patch
new file mode 100644
index 00000000000..87b813a931e
--- /dev/null
+++ b/srcpkgs/qomui/patches/geoip.patch
@@ -0,0 +1,15 @@
+diff --git qomui/update.py qomui/update.py
+index 9230b58..f247741 100755
+--- qomui/update.py
++++ qomui/update.py
+@@ -991,9 +991,7 @@ class AddServers(QtCore.QThread):
+ 
+                 if ip != 0:
+ 
+-                    country_check = check_output(["geoiplookup", "{}".format(ip)]).decode("utf-8")
+-                    cc = country_check.split(" ")[3].split(",")[0]
+-                    country = country_translate(cc)
++                    country = "undefined"
+                     self.log.emit(("debug", "importing {}".format(name)))
+                     custom_servers[name] = {
+                                                 "name": name,
diff --git a/srcpkgs/qomui/template b/srcpkgs/qomui/template
index 9d832bd2387..b74138381be 100644
--- a/srcpkgs/qomui/template
+++ b/srcpkgs/qomui/template
@@ -1,13 +1,13 @@
 # Template file for 'qomui'
 pkgname=qomui
 version=0.8.2
-revision=3
+revision=4
 build_style=python3-module
 pycompile_module="qomui"
 hostmakedepends="python3 python3-setuptools"
 depends="python python3 python3-PyQt5 python3-dbus python3-psutil
  python3-requests python3-BeautifulSoup4 python3-lxml python3-pexpect openvpn
- python3-PyQt5-dbus stunnel geoip geoip-data dnsmasq libcgroup libcgroup-utils
+ python3-PyQt5-dbus stunnel dnsmasq libcgroup libcgroup-utils
  iptables wireguard wireguard-tools openresolv"
 short_desc="OpenVPN Qt management ui"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"

From ab9a67a43408857013e00fbaae40d5e5f88a2602 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 26 Dec 2020 19:56:25 +1100
Subject: [PATCH 3/3] geoip-data: remove.

Has been deprecated by upstream for 2 years now. Is noarch. Distfiles
are no longer found (can only be accessed behind a license). No packages
now use it. If someone really wants an up-to-date legacy database, they
can use geoipupdate (still included in the repo).
---
 srcpkgs/geoip-data/template | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 srcpkgs/geoip-data/template

diff --git a/srcpkgs/geoip-data/template b/srcpkgs/geoip-data/template
deleted file mode 100644
index 2a1991ebf9b..00000000000
--- a/srcpkgs/geoip-data/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'geoip-data'
-pkgname=geoip-data
-version=20171002
-revision=2
-create_wrksrc=yes
-short_desc="Non-DNS IP-to-country resolver C library and utilities (data files)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="CC-BY-SA-4.0"
-homepage="https://dev.maxmind.com/geoip/legacy/geolite/"
-archs=noarch
-broken="broken URLs, downloads unversioned files that change daily!"
-
-do_fetch() {
-	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
-	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
-	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
-	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
-	$XBPS_FETCH_CMD http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
-	$XBPS_FETCH_CMD http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz
-}
-
-do_install() {
-	local f
-	vmkdir usr/share/GeoIP
-	for f in GeoIP GeoIPv6 GeoLiteCity GeoLiteCityv6 GeoIPASNum GeoIPASNumv6; do
-		zcat ../${f}.dat.gz > ${f}.dat
-		rm -f ../${f}.dat.gz
-		vinstall ${f}.dat 644 usr/share/GeoIP
-	done
-}

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: WIP: Geoip drop
  2020-12-26 10:56 [PR PATCH] WIP: Geoip drop fosslinux
@ 2021-01-18 21:25 ` mobinmob
  2021-01-18 21:47 ` mobinmob
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: mobinmob @ 2021-01-18 21:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/27445#issuecomment-762477030

Comment:
Please consider creating a package from https://mailfud.org/geoip-legacy/ in order to provide geoip data in the legacy format.
Archlinux does it:
https://github.com/archlinux/svntogit-packages/tree/packages/geoip-database/trunk

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: WIP: Geoip drop
  2020-12-26 10:56 [PR PATCH] WIP: Geoip drop fosslinux
  2021-01-18 21:25 ` mobinmob
@ 2021-01-18 21:47 ` mobinmob
  2021-01-20  6:36 ` fosslinux
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: mobinmob @ 2021-01-18 21:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 712 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/27445#issuecomment-762477030

Comment:
Please consider creating a package from https://mailfud.org/geoip-legacy/ in order to provide geoip data in the legacy format.
Archlinux does it:
https://github.com/archlinux/svntogit-packages/tree/packages/geoip-database/trunk
We can also use the package(s) directly from artix:

- https://mirrors.dotsrc.org/artix-linux/repos/world/os/x86_64/geoip-database-20201222-1-any.pkg.tar.zst
- https://mirrors.dotsrc.org/artix-linux/repos/world/os/x86_64/geoip-database-extra-20201222-1-any.pkg.tar.zst

@fosslinux I will gladly make and maintain a package for this...

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: WIP: Geoip drop
  2020-12-26 10:56 [PR PATCH] WIP: Geoip drop fosslinux
  2021-01-18 21:25 ` mobinmob
  2021-01-18 21:47 ` mobinmob
@ 2021-01-20  6:36 ` fosslinux
  2021-01-20  6:45 ` the-maldridge
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: fosslinux @ 2021-01-20  6:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/27445#issuecomment-763373756

Comment:
If other maintainers are happy with this, go ahead.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: WIP: Geoip drop
  2020-12-26 10:56 [PR PATCH] WIP: Geoip drop fosslinux
                   ` (2 preceding siblings ...)
  2021-01-20  6:36 ` fosslinux
@ 2021-01-20  6:45 ` the-maldridge
  2021-01-20 12:10 ` q66
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: the-maldridge @ 2021-01-20  6:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 390 bytes --]

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/27445#issuecomment-763378041

Comment:
I'm relatively confident that those files are non-distributable and I'll be they're in violation of the maxmind license.  As for mirrorbits, feel free to drop it.  It was packaged to support auto.voidlinux.org, a service that no longer exists.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: WIP: Geoip drop
  2020-12-26 10:56 [PR PATCH] WIP: Geoip drop fosslinux
                   ` (3 preceding siblings ...)
  2021-01-20  6:45 ` the-maldridge
@ 2021-01-20 12:10 ` q66
  2021-01-20 12:11 ` [PR PATCH] [Closed]: " q66
  2021-01-20 21:46 ` fosslinux
  6 siblings, 0 replies; 8+ messages in thread
From: q66 @ 2021-01-20 12:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27445#issuecomment-763562552

Comment:
oops, overlooked this PR

well, this is all done in master now, so...

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Closed]: WIP: Geoip drop
  2020-12-26 10:56 [PR PATCH] WIP: Geoip drop fosslinux
                   ` (4 preceding siblings ...)
  2021-01-20 12:10 ` q66
@ 2021-01-20 12:11 ` q66
  2021-01-20 21:46 ` fosslinux
  6 siblings, 0 replies; 8+ messages in thread
From: q66 @ 2021-01-20 12:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 591 bytes --]

There's a closed pull request on the void-packages repository

WIP: Geoip drop
https://github.com/void-linux/void-packages/pull/27445

Description:
1. `mirrorbits` does not compile -- no idea why, have tried quite a few things
2. `qomui`'s tests do not pass

@sgn one of the last noarch things

`geoip-data` been deprecated by upstream for 2 years now. Is noarch. Distfiles
are no longer found (can only be accessed behind a license). No packages
now use it after this PR. If someone really wants an up-to-date legacy database, they
can use geoipupdate (still included in the repo).

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: WIP: Geoip drop
  2020-12-26 10:56 [PR PATCH] WIP: Geoip drop fosslinux
                   ` (5 preceding siblings ...)
  2021-01-20 12:11 ` [PR PATCH] [Closed]: " q66
@ 2021-01-20 21:46 ` fosslinux
  6 siblings, 0 replies; 8+ messages in thread
From: fosslinux @ 2021-01-20 21:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/27445#issuecomment-763969486

Comment:
thanks

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-01-20 21:46 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-26 10:56 [PR PATCH] WIP: Geoip drop fosslinux
2021-01-18 21:25 ` mobinmob
2021-01-18 21:47 ` mobinmob
2021-01-20  6:36 ` fosslinux
2021-01-20  6:45 ` the-maldridge
2021-01-20 12:10 ` q66
2021-01-20 12:11 ` [PR PATCH] [Closed]: " q66
2021-01-20 21:46 ` fosslinux

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).