From 6fb27a03a7c4bbc560f0ccff972f780a95bd0319 Mon Sep 17 00:00:00 2001
From: Vincent Herbet <github@arkshine.me>
Date: Thu, 17 Oct 2019 15:42:27 +0200
Subject: [PATCH] Fix GeoIP2 database file extraction (#764)

---
 support/buildbot/package.pl | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/support/buildbot/package.pl b/support/buildbot/package.pl
index c53dddfc..10517889 100755
--- a/support/buildbot/package.pl
+++ b/support/buildbot/package.pl
@@ -7,7 +7,7 @@ use File::Basename;
 use File::stat;
 use File::Temp qw/ tempfile :seekable/;
 use Net::FTP;
-use IO::Uncompress::Gunzip qw(gunzip $GunzipError);
+use Archive::Tar;
 use Time::localtime;
 
 my ($ftp_file, $ftp_host, $ftp_user, $ftp_pass, $ftp_path);
@@ -72,12 +72,10 @@ if (-e $geoIPfile) {
 	unlink($geoIPfile);
 }
 
-open(my $fh, ">", $geoIPfile) 
-    	or die "cannot open $geoIPfile for writing: $!";
-binmode($fh);
-gunzip '../GeoLite2-Country.tar.gz' => $fh
-        or die "gunzip failed: $GunzipError\n";
-close($fh);
+my $next = Archive::Tar->iter('../GeoLite2-Country.tar.gz', 1, {filter => qr/\.mmdb$/});
+while (my $file = $next->()) {
+	$file->extract($geoIPfile) or warn "Extraction failed";
+}
 
 my (@packages,@mac_exclude);
 @packages = ('base', 'cstrike', 'dod', 'esf', 'ns', 'tfc', 'ts');