From b2141918ce7537d99e3b35f3fd0ea0839a3d9cfd Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 27 Sep 2019 13:35:13 +0200 Subject: [PATCH] GeoIP: fix local installation - remove bad bee name - be0ify - use local archives - fix autoconf - remove dev support - boil down --- GeoIP-1.4.8-1.x86_64.bee => GeoIP.be0 | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) rename GeoIP-1.4.8-1.x86_64.bee => GeoIP.be0 (51%) diff --git a/GeoIP-1.4.8-1.x86_64.bee b/GeoIP.be0 similarity index 51% rename from GeoIP-1.4.8-1.x86_64.bee rename to GeoIP.be0 index 298c8f828..828b683d5 100755 --- a/GeoIP-1.4.8-1.x86_64.bee +++ b/GeoIP.be0 @@ -1,7 +1,12 @@ #!/usr/bin/env beesh -SRCURL[0]="http://www.maxmind.com/download/geoip/api/c/GeoIP-${PKGVERSION}.tar.gz" -PATCHURL[0]="http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz" +# BEE_VERSION GeoIP-1.4.8-2 + +# no vars since this is the latest for all time + +SRCURL[0]="/src/mariux/download/GeoIP-1.4.8.tar.gz" + +PATCHURL[0]="/src/mariux/download/GeoIP-1.4.8-1-GeoLiteCity.dat.gz" #PATCHURL[0]="" @@ -26,10 +31,18 @@ mee_patch() { gzip --force -d -c "${@}" > ${S}/GeoLiteCity.dat } +mee_patch_post() { + # do NOT put downloaded patches in /usr/share/bee + unset bee_PATCHFILES +} + mee_configure() { - cp -vax /usr/share/libtool/config/ltmain.sh ${S} + autoreconf -i + cp -vax /usr/share/libtool/config/ltmain.sh ${S} + CFLAGS=-Wno-unused-but-set-variable \ bee_configure \ --disable-dependency-tracking \ + --enable-shared=no \ --with-gnu-ld } @@ -42,4 +55,8 @@ mee_install() { bee_install mkdir -p ${D}/usr/share/GeoIP mv -v ${S}/GeoLiteCity.dat ${D}/usr/share/GeoIP/GeoIPCity.dat + rm -vrf ${D}/usr/include + rm -vrf ${D}/usr/lib + rm -vrf ${D}/etc + rm -vrf ${D}/usr/bin/geoipupdate ${D}/usr/share/man/man1/geoipupdate.1 }