diff options
| author | Sean Chittenden <seanc@FreeBSD.org> | 2003-09-04 21:10:47 +0000 |
|---|---|---|
| committer | Sean Chittenden <seanc@FreeBSD.org> | 2003-09-04 21:10:47 +0000 |
| commit | 15749b3c4b078081ddc480b391ffba8949901f9a (patch) | |
| tree | 1442da916fa557d162535cc81eab5ca29716d782 /www/mod_geoip | |
| parent | Update to 1.2.2 (diff) | |
Chase net/GeoIP's new API and update mod_geoip to 1.2.2
Notes
Notes:
svn path=/head/; revision=88565
Diffstat (limited to 'www/mod_geoip')
| -rw-r--r-- | www/mod_geoip/Makefile | 3 | ||||
| -rw-r--r-- | www/mod_geoip/distinfo | 2 | ||||
| -rw-r--r-- | www/mod_geoip/files/patch-mod_geoip.c | 41 |
3 files changed, 2 insertions, 44 deletions
diff --git a/www/mod_geoip/Makefile b/www/mod_geoip/Makefile index 70b86956c8ff..e8c5bbe801f5 100644 --- a/www/mod_geoip/Makefile +++ b/www/mod_geoip/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mod_geoip -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.2 CATEGORIES= www MASTER_SITES= http://www.maxmind.com/download/geoip/api/mod_geoip/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/www/mod_geoip/distinfo b/www/mod_geoip/distinfo index 89a4bb4af50b..cdb8587a06c4 100644 --- a/www/mod_geoip/distinfo +++ b/www/mod_geoip/distinfo @@ -1 +1 @@ -MD5 (mod_geoip_1.1.1.tar.gz) = 9696b839f4b754935b3f1f0671618075 +MD5 (mod_geoip_1.2.2.tar.gz) = 0f18b00a67c9dfc8d3ad50855bba8419 diff --git a/www/mod_geoip/files/patch-mod_geoip.c b/www/mod_geoip/files/patch-mod_geoip.c deleted file mode 100644 index f3e959fc623e..000000000000 --- a/www/mod_geoip/files/patch-mod_geoip.c +++ /dev/null @@ -1,41 +0,0 @@ ---- mod_geoip.c.orig Mon May 19 15:03:19 2003 -+++ mod_geoip.c Mon May 19 15:08:36 2003 -@@ -209,7 +209,8 @@ - } - - databaseType = GeoIP_database_edition(cfg->gip); -- if (databaseType == GEOIP_COUNTRY_EDITION) { -+ switch (databaseType) { -+ case GEOIP_COUNTRY_EDITION: - country_id = GeoIP_country_id_by_addr(cfg->gip, ipaddr); - - if (country_id > 0) { -@@ -224,7 +225,8 @@ - ap_table_set(r->subprocess_env, "GEOIP_COUNTRY_NAME", country_name); - } - } -- } else if (databaseType == GEOIP_REGION_EDITION) { -+ break; -+ case GEOIP_REGION_EDITION: - giregion = GeoIP_region_by_name (cfg->gip, ipaddr); - if (giregion != NULL) { - if (cfg->GeoIPOutput & GEOIP_NOTES) { -@@ -241,7 +243,9 @@ - } - GeoIPRegion_delete(giregion); - } -- } else if (databaseType == GEOIP_CITY_EDITION) { -+ break; -+ case GEOIP_CITY_EDITION_REV0: -+ case GEOIP_CITY_EDITION_REV1: - gir = GeoIP_record_by_addr(cfg->gip, ipaddr); - if (gir != NULL) { - if (cfg->GeoIPOutput & GEOIP_NOTES) { -@@ -261,6 +265,7 @@ - ap_table_set(r->subprocess_env, "GEOIP_CITY", gir->city); - } - } -+ break; - } - return OK; - } |