From c0083c77d059c3997a3fe6ea35b5f6ff0db6368d Mon Sep 17 00:00:00 2001 From: susanbian Date: Mon, 26 Jun 2017 09:35:22 +0800 Subject: geoipupdate 2.2.2 -> 2.4.0 Upgrade geoipupdate from 2.2.2 to 2.4.0 License checksum changed, since the following function are added. 1. database directory is writable 2. ${datarootdir}/GeoIP is now created on make install. 3. prints out additional information from the server when download reques results. Signed-off-by: susanbian Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../geoip/geoipupdate-2.2.2/GeoIP.conf | 11 -------- .../geoip/geoipupdate-2.2.2/geoipupdate.cron | 5 ---- .../geoip/geoipupdate-2.4.0/GeoIP.conf | 11 ++++++++ .../geoip/geoipupdate-2.4.0/geoipupdate.cron | 5 ++++ .../recipes-support/geoip/geoipupdate_2.2.2.bb | 30 -------------------- .../recipes-support/geoip/geoipupdate_2.4.0.bb | 33 ++++++++++++++++++++++ 6 files changed, 49 insertions(+), 46 deletions(-) delete mode 100644 meta-networking/recipes-support/geoip/geoipupdate-2.2.2/GeoIP.conf delete mode 100644 meta-networking/recipes-support/geoip/geoipupdate-2.2.2/geoipupdate.cron create mode 100644 meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf create mode 100644 meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron delete mode 100644 meta-networking/recipes-support/geoip/geoipupdate_2.2.2.bb create mode 100644 meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb (limited to 'meta-networking/recipes-support/geoip') diff --git a/meta-networking/recipes-support/geoip/geoipupdate-2.2.2/GeoIP.conf b/meta-networking/recipes-support/geoip/geoipupdate-2.2.2/GeoIP.conf deleted file mode 100644 index 134cfed1f5..0000000000 --- a/meta-networking/recipes-support/geoip/geoipupdate-2.2.2/GeoIP.conf +++ /dev/null @@ -1,11 +0,0 @@ -# The following UserId and LicenseKey are required placeholders: -UserId 999999 -LicenseKey 000000000000 - -# Include one or more of the following ProductIds: -# * GeoLite2-City - GeoLite 2 City -# * GeoLite2-Country - GeoLite2 Country -# * 506 - GeoLite Legacy Country -# * 517 - GeoLite Legacy ASN -# * 533 - GeoLite Legacy City -ProductIds GeoLite2-City GeoLite2-Country 506 517 533 diff --git a/meta-networking/recipes-support/geoip/geoipupdate-2.2.2/geoipupdate.cron b/meta-networking/recipes-support/geoip/geoipupdate-2.2.2/geoipupdate.cron deleted file mode 100644 index 40597a856e..0000000000 --- a/meta-networking/recipes-support/geoip/geoipupdate-2.2.2/geoipupdate.cron +++ /dev/null @@ -1,5 +0,0 @@ -# top of crontab -MAILTO=your@email.com - -32 11 * * 4 /usr/local/bin/geoipupdate -# end of crontab diff --git a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf b/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf new file mode 100644 index 0000000000..134cfed1f5 --- /dev/null +++ b/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf @@ -0,0 +1,11 @@ +# The following UserId and LicenseKey are required placeholders: +UserId 999999 +LicenseKey 000000000000 + +# Include one or more of the following ProductIds: +# * GeoLite2-City - GeoLite 2 City +# * GeoLite2-Country - GeoLite2 Country +# * 506 - GeoLite Legacy Country +# * 517 - GeoLite Legacy ASN +# * 533 - GeoLite Legacy City +ProductIds GeoLite2-City GeoLite2-Country 506 517 533 diff --git a/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron b/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron new file mode 100644 index 0000000000..40597a856e --- /dev/null +++ b/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron @@ -0,0 +1,5 @@ +# top of crontab +MAILTO=your@email.com + +32 11 * * 4 /usr/local/bin/geoipupdate +# end of crontab diff --git a/meta-networking/recipes-support/geoip/geoipupdate_2.2.2.bb b/meta-networking/recipes-support/geoip/geoipupdate_2.2.2.bb deleted file mode 100644 index 3bc936a0d0..0000000000 --- a/meta-networking/recipes-support/geoip/geoipupdate_2.2.2.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Crontab entry to provide weekly updates of the GeoIP free databases." -DESCRIPTION = "update databases for GeoIP" - -HOMEPAGE = "http://dev.maxmind.com/geoip/" -SECTION = "net" - -DEPENDS = "zlib curl" - -SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.2.2/geoipupdate-2.2.2.tar.gz \ - file://GeoIP.conf \ - file://geoipupdate.cron \ - " - -SRC_URI[md5sum] = "06284bd7bcb298d078d794eb630dae55" -SRC_URI[sha256sum] = "156ab7604255a9c62c4a442c76d48d024ac813c6542639bffa93b28e2a781621" - -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "\ -file://ChangeLog.md;md5=8ebf6f27a39125c3d600c90914b4034a \ -" - -inherit autotools - -do_install_append() { - install -d ${D}/${sysconfdir} - install -d ${D}/${sysconfdir}/cron.d - install ${WORKDIR}/GeoIP.conf ${D}/${sysconfdir}/ - install ${WORKDIR}/geoipupdate.cron ${D}/${sysconfdir}/cron.d/ -} diff --git a/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb b/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb new file mode 100644 index 0000000000..3e045bb27d --- /dev/null +++ b/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "Crontab entry to provide weekly updates of the GeoIP free databases." +DESCRIPTION = "update databases for GeoIP" + +HOMEPAGE = "http://dev.maxmind.com/geoip/" +SECTION = "net" + +DEPENDS = "zlib curl" + +SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.4.0/geoipupdate-2.4.0.tar.gz \ + file://GeoIP.conf \ + file://geoipupdate.cron \ + " +SRC_URI[md5sum] = "02f9712fb80e8e979d3d54cda7f7704f" +SRC_URI[sha256sum] = "8b4e88ce8d84e9c75bc681704d19ec5c63c54f01e945f7669f97fb0df7e13952" + +LICENSE = "GPLv2" + +LIC_FILES_CHKSUM = "\ +file://ChangeLog.md;md5=334337b6ecbb65093bae66b3ae21c8c2 \ +" +FILES_${PN} = "/usr/share/GeoIP \ + /etc/GeoIP.conf \ + /etc/cron.d/geoipupdate.cron \ + /usr/bin/geoipupdate \ +" +inherit autotools + +do_install_append() { + install -d ${D}/${sysconfdir} + install -d ${D}/${sysconfdir}/cron.d + install ${WORKDIR}/GeoIP.conf ${D}/${sysconfdir}/ + install ${WORKDIR}/geoipupdate.cron ${D}/${sysconfdir}/cron.d/ +} -- cgit v1.2.3-54-g00ecf