diff options
| author | Sean Chittenden <seanc@FreeBSD.org> | 2003-05-19 22:11:33 +0000 |
|---|---|---|
| committer | Sean Chittenden <seanc@FreeBSD.org> | 2003-05-19 22:11:33 +0000 |
| commit | 39200c9b7ae41a1476ce88cea408b7eadab6e5bd (patch) | |
| tree | 71c40a8274fc9e0079783b11f51510f3d146b572 /www/mod_geoip | |
| parent | Update checksum. Developer has removed the bash_completion line from the debian (diff) | |
Fix mod_geoip with recent GeoIP.
Submitted by: kris/bento, Lew Payne <lew@clickbank.com>
Notes
Notes:
svn path=/head/; revision=81496
Diffstat (limited to 'www/mod_geoip')
| -rw-r--r-- | www/mod_geoip/Makefile | 4 | ||||
| -rw-r--r-- | www/mod_geoip/files/patch-mod_geoip.c | 41 |
2 files changed, 41 insertions, 4 deletions
diff --git a/www/mod_geoip/Makefile b/www/mod_geoip/Makefile index 50abbe5228b2..70b86956c8ff 100644 --- a/www/mod_geoip/Makefile +++ b/www/mod_geoip/Makefile @@ -21,10 +21,6 @@ LIB_DEPENDS= GeoIP.3:${PORTSDIR}/net/GeoIP .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile" -.endif - APXS?= ${LOCALBASE}/sbin/apxs APACHE_PORT?= ${PORTSDIR}/www/apache13 diff --git a/www/mod_geoip/files/patch-mod_geoip.c b/www/mod_geoip/files/patch-mod_geoip.c new file mode 100644 index 000000000000..f3e959fc623e --- /dev/null +++ b/www/mod_geoip/files/patch-mod_geoip.c @@ -0,0 +1,41 @@ +--- 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; + } |