On Tue, Apr 28, 2020 at 12:20:44PM +0100, Stuart Henderson wrote:
> I think it's time for this to go now. No longer used in other ports
> and the database is EoL. OK?
OK
> Index: devel/quirks/files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.949
> diff -u -p -r1.949 Quirks.pm
> --- devel/quirks/files/Quirks.pm 27 Apr 2020 19:52:14 -0000 1.949
> +++ devel/quirks/files/Quirks.pm 28 Apr 2020 11:19:36 -0000
> @@ -1555,6 +1555,7 @@ my $obsolete_reason = {
> 'py-iniparse' => 5,
> 'qtdeclarative-xmllistmodel' => 3,
> 'jabberd' => 3,
> + 'GeoIP' => 22,
> };
>
> # reasons for obsolete packages
> @@ -1581,6 +1582,7 @@ my @msg = (
> "no longer maintained upstream, suggest sqlitebrowser, kexi", #19
> "merged into IETF Opus codec, obsolete, audio/mumble uses bundled
> version now", #20
> "upstream recommends to use composer to build a drupal site", #21
> + "the original GeoIP database is end of life; use libmaxminddb/GeoIP2",
> #22
> );
>
> # ->is_base_system($handle, $state):
> Index: net/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/Makefile,v
> retrieving revision 1.1196
> diff -u -p -r1.1196 Makefile
> --- net/Makefile 27 Apr 2020 20:23:00 -0000 1.1196
> +++ net/Makefile 28 Apr 2020 11:19:36 -0000
> @@ -1,7 +1,6 @@
> # $OpenBSD: Makefile,v 1.1196 2020/04/27 20:23:00 danj Exp $
>
> SUBDIR =
> - SUBDIR += GeoIP
> SUBDIR += adns
> SUBDIR += adsuck
> SUBDIR += aggregate
> Index: net/GeoIP/Makefile
> ===================================================================
> RCS file: net/GeoIP/Makefile
> diff -N net/GeoIP/Makefile
> --- net/GeoIP/Makefile 16 Jun 2019 23:08:38 -0000 1.60
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,50 +0,0 @@
> -# $OpenBSD: Makefile,v 1.60 2019/06/16 23:08:38 sthen Exp $
> -
> -COMMENT-main= find the country where IP address/hostname originates
> from
> -COMMENT-db= GeoIP GeoLite database: IPv4/v6 address to country
> -COMMENT-city= GeoIP GeoLite database: IPv4/v6 address to city
> -COMMENT-asn= GeoIP GeoLite database: IPv4/v6 address to AS number
> -
> -V= 1.6.12
> -REVISION= 2
> -D= 20180401
> -DISTNAME= GeoIP-$V
> -PKGNAME-main= GeoIP-$V
> -PKGNAME-db= geolite-country-$D
> -PKGNAME-city= geolite-city-$D
> -PKGNAME-asn= geolite-asn-$D
> -PORTROACH= skipv:$V
> -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
> - geolite-data-$D.tar.xz:0
> -
> -SHARED_LIBS += GeoIP 9.0 # 7.3
> -
> -CATEGORIES= net geo
> -
> -HOMEPAGE= https://dev.maxmind.com/geoip/legacy/downloadable/
> -
> -# geoip-api-c: LGPLv2.1+
> -# geolite DBs: CC BY-SA 4.0
> -PERMIT_PACKAGE= Yes
> -
> -WANTLIB-main += c
> -
> -MASTER_SITES=
> https://github.com/maxmind/geoip-api-c/releases/download/v$V/
> -MASTER_SITES0= https://spacehopper.org/mirrors/
> -
> -MULTI_PACKAGES= -main -db -city -asn
> -RUN_DEPENDS-main= net/GeoIP,-db
> -
> -CONFIGURE_STYLE= gnu
> -SEPARATE_BUILD= Yes
> -CONFIGURE_ARGS= --datadir=${LOCALSTATEDIR}/db
> -
> -post-install:
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/GeoIP/
> - ${INSTALL_DATA} ${WRKDIR}/data/* ${PREFIX}/share/examples/GeoIP/
> - chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/GeoIP/
> -
> -pre-test:
> - ln -s ../data ${WRKSRC}/data
> -
> -.include <bsd.port.mk>
> Index: net/GeoIP/distinfo
> ===================================================================
> RCS file: net/GeoIP/distinfo
> diff -N net/GeoIP/distinfo
> --- net/GeoIP/distinfo 6 Apr 2018 17:14:24 -0000 1.39
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -SHA256 (GeoIP-1.6.12.tar.gz) = Hft0gAPF5Lf9VrqMTNeGYz1db0CVR1hPaRA5g4ljb4A=
> -SHA256 (geolite-data-20180401.tar.xz) =
> tN3GrQ5BurBWDSZuB/tuKu6yyLSBvXNXEOeBSWW8mVo=
> -SIZE (GeoIP-1.6.12.tar.gz) = 473914
> -SIZE (geolite-data-20180401.tar.xz) = 25773396
> Index: net/GeoIP/pkg/DESCR-asn
> ===================================================================
> RCS file: net/GeoIP/pkg/DESCR-asn
> diff -N net/GeoIP/pkg/DESCR-asn
> --- net/GeoIP/pkg/DESCR-asn 26 May 2016 15:21:09 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,9 +0,0 @@
> -This package contains a snapshot of the free GeoLite ASN databases
> -under CC BY-SA 4.0 license.
> -
> -"This product includes GeoLite data created by MaxMind, available from
> -http://www.maxmind.com.";
> -
> -Free-of-charge city, country and AS number databases are available from
> -http://dev.maxmind.com/geoip/legacy/geolite/, commercial databases and
> -automatic update services from http://www.maxmind.com/.
> Index: net/GeoIP/pkg/DESCR-city
> ===================================================================
> RCS file: net/GeoIP/pkg/DESCR-city
> diff -N net/GeoIP/pkg/DESCR-city
> --- net/GeoIP/pkg/DESCR-city 26 May 2016 15:21:09 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,9 +0,0 @@
> -This package contains a snapshot of the free GeoLite city-level databases
> -under CC BY-SA 4.0 license.
> -
> -"This product includes GeoLite data created by MaxMind, available from
> -http://www.maxmind.com.";
> -
> -Free-of-charge city, country and AS number databases are available from
> -http://dev.maxmind.com/geoip/legacy/geolite/, commercial databases and
> -automatic update services from http://www.maxmind.com/.
> Index: net/GeoIP/pkg/DESCR-db
> ===================================================================
> RCS file: net/GeoIP/pkg/DESCR-db
> diff -N net/GeoIP/pkg/DESCR-db
> --- net/GeoIP/pkg/DESCR-db 26 May 2016 15:21:09 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,9 +0,0 @@
> -This package contains a snapshot of the free GeoLite country-level databases
> -under CC BY-SA 4.0 license.
> -
> -"This product includes GeoLite data created by MaxMind, available from
> -http://www.maxmind.com.";
> -
> -Free-of-charge city, country and AS number databases are available from
> -http://dev.maxmind.com/geoip/legacy/geolite/, commercial databases and
> -automatic update services from http://www.maxmind.com/.
> Index: net/GeoIP/pkg/DESCR-main
> ===================================================================
> RCS file: net/GeoIP/pkg/DESCR-main
> diff -N net/GeoIP/pkg/DESCR-main
> --- net/GeoIP/pkg/DESCR-main 26 May 2016 15:21:09 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,7 +0,0 @@
> -GeoIP includes a C library and command-line tools to look up information in
> -MaxMind's IP geolocation databases.
> -
> -Free-of-charge city and AS number databases and updated country databases are
> -available from http://dev.maxmind.com/geoip/legacy/geolite/ (and packaged in
> -the geolite-* packages), commercial databases and automatic update services
> -from http://www.maxmind.com/.
> Index: net/GeoIP/pkg/MESSAGE-main
> ===================================================================
> RCS file: net/GeoIP/pkg/MESSAGE-main
> diff -N net/GeoIP/pkg/MESSAGE-main
> --- net/GeoIP/pkg/MESSAGE-main 16 Jun 2019 23:08:38 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,8 +0,0 @@
> -
> -The free databases used by this software are no longer updated and are
> -increasingly inaccurate. The commercial databases compatible with this are
> -no longer available to new customers.
> -
> -Switch to libmaxminddb to continue using free databases (geolite2),
> -see https://blog.maxmind.com/tag/geolite-legacy/
> -
> Index: net/GeoIP/pkg/PLIST-asn
> ===================================================================
> RCS file: net/GeoIP/pkg/PLIST-asn
> diff -N net/GeoIP/pkg/PLIST-asn
> --- net/GeoIP/pkg/PLIST-asn 16 Apr 2017 14:17:16 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,7 +0,0 @@
> -@comment $OpenBSD: PLIST-asn,v 1.2 2017/04/16 14:17:16 sthen Exp $
> -@sample ${LOCALSTATEDIR}/db/GeoIP/
> -share/examples/GeoIP/
> -share/examples/GeoIP/GeoIPASNum.dat
> -@sample ${LOCALSTATEDIR}/db/GeoIP/GeoIPASNum.dat
> -share/examples/GeoIP/GeoIPASNumv6.dat
> -@sample ${LOCALSTATEDIR}/db/GeoIP/GeoIPASNumv6.dat
> Index: net/GeoIP/pkg/PLIST-city
> ===================================================================
> RCS file: net/GeoIP/pkg/PLIST-city
> diff -N net/GeoIP/pkg/PLIST-city
> --- net/GeoIP/pkg/PLIST-city 16 Apr 2017 14:17:16 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,7 +0,0 @@
> -@comment $OpenBSD: PLIST-city,v 1.3 2017/04/16 14:17:16 sthen Exp $
> -@sample ${LOCALSTATEDIR}/db/GeoIP/
> -share/examples/GeoIP/
> -share/examples/GeoIP/GeoLiteCity.dat
> -@sample ${LOCALSTATEDIR}/db/GeoIP/GeoIPCity.dat
> -share/examples/GeoIP/GeoLiteCityv6.dat
> -@sample ${LOCALSTATEDIR}/db/GeoIP/GeoIPCityv6.dat
> Index: net/GeoIP/pkg/PLIST-db
> ===================================================================
> RCS file: net/GeoIP/pkg/PLIST-db
> diff -N net/GeoIP/pkg/PLIST-db
> --- net/GeoIP/pkg/PLIST-db 1 Mar 2016 00:06:57 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,9 +0,0 @@
> -@comment $OpenBSD: PLIST-db,v 1.1 2016/03/01 00:06:57 sthen Exp $
> -@conflict GeoIP-<1.6.5p3
> -share/examples/GeoIP/
> -@sample ${LOCALSTATEDIR}/db/GeoIP/
> -share/examples/GeoIP/GeoIP.dat
> -@sample ${LOCALSTATEDIR}/db/GeoIP/GeoIP.dat
> -share/examples/GeoIP/GeoIPv6.dat
> -@sample ${LOCALSTATEDIR}/db/GeoIP/GeoIPv6.dat
> -share/examples/GeoIP/readme.txt
> Index: net/GeoIP/pkg/PLIST-main
> ===================================================================
> RCS file: net/GeoIP/pkg/PLIST-main
> diff -N net/GeoIP/pkg/PLIST-main
> --- net/GeoIP/pkg/PLIST-main 21 Dec 2018 23:45:10 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -@comment $OpenBSD: PLIST-main,v 1.2 2018/12/21 23:45:10 ajacoutot Exp $
> -@pkgpath net/GeoIP
> -@extraunexec rm -f /var/db/GeoIP/*
> -@bin bin/geoiplookup
> -@bin bin/geoiplookup6
> -include/GeoIP.h
> -include/GeoIPCity.h
> -lib/libGeoIP.a
> -lib/libGeoIP.la
> -@lib lib/libGeoIP.so.${LIBGeoIP_VERSION}
> -lib/pkgconfig/geoip.pc
> -@man man/man1/geoiplookup.1
> -@man man/man1/geoiplookup6.1
> Index: devel/quirks/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.930
> diff -u -p -r1.930 Makefile
> --- devel/quirks/Makefile 27 Apr 2020 19:52:14 -0000 1.930
> +++ devel/quirks/Makefile 28 Apr 2020 11:19:36 -0000
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-3.321
> +PKGNAME = quirks-3.322
> PKG_ARCH = *
> MAINTAINER = Marc Espie <es...@openbsd.org>
>
>
--
Antoine
