Updated geoIp lib to 1.6.9 sqlite to 3.15.2, fixed filename for new

geoip
vasyahuyasa · Dec 18, 2016 · 8570f96 · 8570f96
1 parent b19adf5
commit 8570f96
Show file tree

Hide file tree

Showing 12 changed files with 21,349 additions and 8,253 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -109,13 +109,13 @@ SERVER_OBJS= \
 
 #geoip
 ifeq ($(USE_GEOIP),true)
-override CXXFLAGS+= -DGEOIP -DGEOIPDATADIR -DPACKAGE_VERSION=\"1.5.1\"
+override CXXFLAGS+= -DGEOIP -DGEOIPDATADIR -DPACKAGE_VERSION=\"1.6.9\"
 override INCLUDES+= -Imod/libGeoIP/
 override SERVER_OBJS+= \
         mod/geoipmod2-standalone.o \
 	mod/libGeoIP/GeoIP-standalone.o \
 	mod/libGeoIP/GeoIPCity-standalone.o \
-        mod/libGeoIP/GeoIP_depreciated-standalone.o
+        mod/libGeoIP/GeoIP_deprecated-standalone.o
 endif
 #end of geoip
 

diff --git a/src/Makefile.win32 b/src/Makefile.win32
@@ -84,13 +84,13 @@ SERVER_OBJS= \
 
 #geoip
 ifeq ($(USE_GEOIP),true)
-override CXXFLAGS+= -DGEOIPDATADIR -DGEOIP -DPACKAGE_VERSION=\"1.5.1\"
+override CXXFLAGS+= -DGEOIPDATADIR -DGEOIP -DPACKAGE_VERSION=\"1.6.9\"
 override INCLUDES+= -Imod/libGeoIP/
 override SERVER_OBJS+= \
     mod/geoipmod2-standalone.o \
 	mod/libGeoIP/GeoIP-standalone.o \
 	mod/libGeoIP/GeoIPCity-standalone.o \
-    mod/libGeoIP/GeoIP_depreciated-standalone.o
+    mod/libGeoIP/GeoIP_deprecated-standalone.o
 endif
 #end of geoip
 

diff --git a/src/mod/libGeoIP/GeoIP.c b/src/mod/libGeoIP/GeoIP.c