Merge pull request #119 from quakenet/geoip

GEOIP: use system libgeoip

.github/workflows/ccpp.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies
-      run: sudo apt-get install git gcc make python2.7 python-minimal flex bison liblua5.1-0-dev libmariadbclient-dev libpq-dev libpcre3-dev zlib1g-dev
+      run: sudo apt-get install git gcc make python2.7 python-minimal flex bison liblua5.1-0-dev libmariadbclient-dev libpq-dev libpcre3-dev zlib1g-dev libgeoip-dev
     - name: configure
       run: ./configure -R -v
     - name: make

configure.ini

@@ -3,7 +3,7 @@
 
 # libraries we're gonna search for
 [core]
-libs=pgsql mariadb lua pcre sqlite z
+libs=pgsql mariadb lua pcre sqlite z geoip
 
 # dummy libraries, if a module requires one of these then it needs one of the supplied libraries
 # the first one will be chosen by default, override with --with-key=value
@@ -35,7 +35,7 @@ tutorbot=
 fsck=
 nterfacer=pcre
 pqsql=pgsql
-geoip=
+geoip=geoip
 clonehistogram=
 lua=lua
 versionscan=
@@ -133,6 +133,9 @@ alwayspresent=1
 [libz]
 pkgconfig=zlib
 
+[libgeoip]
+pkgconfig=geoip
+
 # additional variables for various systems
 [osvars]
 FreeBSD=CFLAGS+=-fgnu89-inline

geoip/Makefile

@@ -1,21 +1,9 @@
 include ../build.mk
 
-GEOIPDIRS=libGeoIP
-LDFLAGS+=-lc
+CFLAGS+=$(INCGEOIP)
+LDFLAGS+=$(LIBGEOIP)
 
-.PHONY: all clean distclean $(GEOIPDIRS) dirs
+.PHONY: all
+all: geoip.so
 
-all: dirs geoip.so
-
-libGeoIP/libgeoip.a: dirs
-
-geoip.so: geoip.o libGeoIP/libgeoip.a
-
-dirs: $(GEOIPDIRS)
-
-$(GEOIPDIRS):
-	cd $@ && $(MAKE) $(MFLAGS) all
-
-clean:
-	rm -f */*.o */*.so *.o *.so */*.a
-	rm -rf .deps */.deps
+geoip.so: geoip.o

geoip/geoip.c

@@ -12,7 +12,7 @@
 
 #include <strings.h>
 
-#include "libGeoIP/GeoIP.h"
+#include <GeoIP.h>
 #include "geoip.h"
 
 MODULE_VERSION("");
@@ -33,11 +33,14 @@ void _init(void) {
   sstring *filename;
 
   filename = getcopyconfigitem("geoip", "db", "GeoIP.dat", 256);
-  gi = GeoIP_open(filename->content, GEOIP_MEMORY_CACHE);
-  freesstring(filename);
 
-  if(!gi)
+  gi = GeoIP_open(filename->content, GEOIP_MEMORY_CACHE);
+  if(!gi) {
+    Error("geoip", ERR_WARNING, "Unable to load geoip database [filename: %s]", filename->content);
+    freesstring(filename);
     return;
+  }
+  freesstring(filename);
 
   geoip_nickext = registernickext("geoip");
   if(geoip_nickext == -1)