geoip: store binary blobs instead of base64 sources

diff --git a/.gitignore b/.gitignore
index 4a0fbce40300b5bf80829579061ceb86d827cfb0..3823101c7182f87147f1ffb4aeda15b5918b24a8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,4 @@ pdns_recursor.pid
 *.gcda
 *.gcno
 *.gcov
-modules/geoipbackend/regression-tests/GeoLiteCity.dat
-modules/geoipbackend/regression-tests/GeoLiteCity.mmdb
 built_pkgs

diff --git a/modules/geoipbackend/regression-tests/GeoLiteCity.dat b/modules/geoipbackend/regression-tests/GeoLiteCity.dat
new file mode 100644 (file)
index 0000000..552a992
Binary files /dev/null and b/modules/geoipbackend/regression-tests/GeoLiteCity.dat differ

diff --git a/modules/geoipbackend/regression-tests/GeoLiteCity.dat.b64 b/modules/geoipbackend/regression-tests/GeoLiteCity.dat.b64
deleted file mode 100644 (file)
index 5566740..0000000
--- a/modules/geoipbackend/regression-tests/GeoLiteCity.dat.b64
+++ /dev/null
@@ -1,12 +0,0 @@
-AQAAUwAAIQAAAgAAUwAAAwAAUwAABAAAUwAABQAAUwAABgAAUwAABwAAUwAACAAACQAAUwAACgAA
-UwAACwAAUwAADAAAUwAADQAAUwAADgAAUwAADwAAUwAAEAAAUwAAEQAAUwAAEgAAUwAAEwAAUwAA
-FAAAUwAAFQAAUwAAFgAAUwAAFwAAUwAAGAAAUwAAGQAAUwAAGgAAUwAAGwAAUwAAHAAAUwAAHQAA
-UwAAHgAAUwAAHwAAIAAAUwAAVAAAagAAgAAAIgAAUwAAIwAAUwAAJAAAUwAAJQAAUwAAJgAAUwAA
-UwAAJwAAKAAAUwAAKQAAUwAAKgAAUwAAKwAAUwAALAAAUwAALQAAUwAALgAAQAAAUwAALwAAMAAA
-UwAAMQAAUwAAMgAAUwAAMwAAUwAANAAAUwAANQAAUwAANgAANwAAUwAAlgAAOAAAUwAAOQAAUwAA
-OgAAUwAAOwAAUwAAPAAAUwAAPQAAUwAAPgAAUwAAPwAAUwAAlgAAUwAAQQAAUwAAQgAAUwAAQwAA
-UwAARAAAUwAARQAAUwAARgAAUwAARwAASQAAUwAASAAAUwAAsgAASgAAUwAASwAAUwAATAAAUwAA
-TQAAUwAATgAAUwAATwAAUwAAUAAAUwAAUQAAUwAAUgAAUwAAsgAAUwAAKvZMMQBDMQAwMDAwMQBA
-dxtAdxsAAAD2TDIAQzIAMDAwMDIAQHcbQHcbAAAA9kwzAEMzADAwMDAzAEB3G0B3GwAAABBPQwBN
-ZWxib3VybmUAMzA5NQBQnhtQnhsAAADhTkEATXVraWx0ZW8AOTgyNzUAvMYi6M0IPX8MY3N2MmRh
-dC5wef///wJTAAA=

diff --git a/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb b/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb
new file mode 100644 (file)
index 0000000..2ef5889
Binary files /dev/null and b/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb differ

diff --git a/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb.b64 b/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb.b64
deleted file mode 100644 (file)
index 60da132..0000000
--- a/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb.b64
+++ /dev/null
@@ -1,35 +0,0 @@
-AAABAAAAoAAAAgAAAKAAAAMAAACgAAAEAAAAoAAABQAAAKAAAAYAAACgAAAHAAAAoAAACAAAAKAA
-AAkAAACgAAAKAAAAoAAACwAAAKAAAAwAAACgAAANAAAAoAAADgAAAKAAAA8AAACgAAAQAAAAoAAA
-EQAAAKAAABIAAACgAAATAAAAoAAAFAAAAKAAABUAAACgAAAWAAAAoAAAFwAAAKAAABgAAACgAAAZ
-AAAAoAAAGgAAAKAAABsAAACgAAAcAAAAoAAAHQAAAKAAAB4AAACgAAAfAAAAoAAAIAAAAKAAACEA
-AACgAAAiAAAAoAAAIwAAAKAAACQAAACgAAAlAAAAoAAAJgAAAKAAACcAAACgAAAoAAAAoAAAKQAA
-AKAAACoAAACgAAArAAAAoAAALAAAAKAAAC0AAACgAAAuAAAAoAAALwAAAKAAADAAAACgAAAxAAAA
-oAAAMgAAAKAAADMAAACgAAA0AAAAoAAANQAAAKAAADYAAACgAAA3AAAAoAAAOAAAAKAAADkAAACg
-AAA6AAAAoAAAOwAAAKAAADwAAACgAAA9AAAAoAAAPgAAAKAAAD8AAACgAABAAAAAoAAAQQAAAKAA
-AEIAAACgAABDAAAAoAAARAAAAKAAAEUAAACgAABGAAAAoAAARwAAAKAAAEgAAACgAABJAAAAoAAA
-SgAAAKAAAEsAAACgAABMAAAAoAAATQAAAKAAAE4AAACgAABPAAAAoAAAUAAAAKAAAFEAAACgAABS
-AAAAoAAAUwAAAKAAAFQAAACgAABVAAAAoAAAVgAAAKAAAFcAAACgAABYAAAAoAAAWQAAAKAAAFoA
-AACgAABbAAAAoAAAXAAAAKAAAF0AAACgAABeAAAAoAAAXwAAAKAAAGAAAACgAABhAAAAoAAAYgAA
-AIEAAGMAAACgAABkAAAAoAAAZQAAAKAAAGYAAACgAABnAAAAoAAAoAAAAGgAAGkAAACgAABqAAAA
-oAAAawAAAKAAAGwAAACgAABtAAAAoAAAbgAAAKAAAG8AAAB4AACgAAAAcAAAcQAAAKAAAHIAAACg
-AABzAAAAoAAAdAAAAKAAAHUAAACgAAB2AAAAoAAAdwAAAKAAAKAAAACwAAB5AAAAoAAAegAAAKAA
-AHsAAACgAAB8AAAAoAAAfQAAAKAAAH4AAACgAAB/AAAAoAAAoAAAAIAAAKAAAAG1AACgAAAAggAA
-oAAAAIMAAKAAAACEAACgAAAAhQAAoAAAAIYAAKAAAACHAACIAAAAoAAAiQAAAKAAAIoAAACgAACL
-AAAAoAAAjAAAAKAAAI0AAACgAACOAAAAoAAAjwAAAKAAAJAAAACgAACRAAAAoAAAkgAAAKAAAJMA
-AACgAACUAAAAoAAAlQAAAKAAAJYAAACgAACXAAAAoAAAmAAAAKAAAJkAAACgAACaAAAAoAAAmwAA
-AKAAAJwAAACgAACdAAAAoAAAngAAAJ8AAKAAAAJEAAKOAAACzQAAAAAAAAAAAAAAAAAAAADmWGF1
-dG9ub21vdXNfc3lzdGVtX251bWJlcsIQkl0BYXV0b25vbW91c19zeXN0ZW1fb3JnYW5pemF0aW9u
-TFRlc3QgVGVsZWtvbURjaXR54kpnZW9uYW1lX2lkwyDVJkVuYW1lc+FCZW5IUmVzZWFyY2hJY29u
-dGluZW5040Rjb2RlQk9DIFDDX3IvIF/hQmVuR09jZWFuaWFHY291bnRyeeMgUMMfsxBIaXNvX2Nv
-ZGVCQVUgX+FCZW5JQXVzdHJhbGlhSGxvY2F0aW9u409hY2N1cmFjeV9yYWRpdXOhAUhsYXRpdHVk
-ZWg/8AAAAAAAAElsb25naXR1ZGVoP/AAAAAAAADmIAHCDPggHU1UZXN0IE5ldHdvcmtzIEriIFDD
-WJESIF/hQmVuSE11a2lsdGVvIHLjIH1CTkEgUMNfci0gX+FCZW5NTm9ydGggQW1lcmljYSCZ4yBQ
-w19l4SCoQlVTIF/hQmVuTVVuaXRlZCBTdGF0ZXMgxOMgzqEBIOBoQEf03S8an74g8mjAXpN4A0bc
-XeMgSuIgUMEBIF/hQmVuQkMxIJnjIFDBASCoQk8xIF/hQmVuQ08gMUxzdWJkaXZpc2lvbnMBBOMg
-UMEBIKhCTDEgX+FCZW5DTCAx4yBK4iBQwQIgX+FCZW5CQzIgmeMgUMECIKhCTzEgX+FCZW5DTyAy
-IbsBBOMgUMECIKhCTDIgX+FCZW5DTCAy4yBK4iBQwQMgX+FCZW5CQzMgmeMgUMEDIKhCTzEgX+FC
-ZW5DTyAzIbsBBOMgUMEDIKhCTDMgX+FCZW5DTCAzq83vTWF4TWluZC5jb23pW2JpbmFyeV9mb3Jt
-YXRfbWFqb3JfdmVyc2lvbqECW2JpbmFyeV9mb3JtYXRfbWlub3JfdmVyc2lvbqBLYnVpbGRfZXBv
-Y2gEAlrVhPpNZGF0YWJhc2VfdHlwZUxHZW9DaXR5LUxpdGVLZGVzY3JpcHRpb27hQmVuU01vY2sg
-Z2VvaXAgZGF0YWJhc2VKaXBfdmVyc2lvbqEGSWxhbmd1YWdlcwEEQmVuSm5vZGVfY291bnTBoEty
-ZWNvcmRfc2l6ZaEc

diff --git a/regression-tests.auth-py/runtests b/regression-tests.auth-py/runtests
index 65e7868c5c564e6ea6f2bfc071b92734fbb17ce4..68797ebddc965805db0ee05be24f36d2e00f4c6e 100755 (executable)
--- a/regression-tests.auth-py/runtests
+++ b/regression-tests.auth-py/runtests
@@ -20,11 +20,6 @@ export PDNSUTIL=${PDNSUTIL:-${PWD}/../pdns/pdnsutil}
 
 export PREFIX=127.0.0
 
-readonly GEOIP_TESTS_DIR=../modules/geoipbackend/regression-tests
-if [ ! -f ${GEOIP_TESTS_DIR}/GeoLiteCity.mmdb ] ; then
-    base64 -d ${GEOIP_TESTS_DIR}/GeoLiteCity.mmdb.b64 > ${GEOIP_TESTS_DIR}/GeoLiteCity.mmdb
-fi
-
 for bin in "$PDNS" "$PDNSUTIL"; do
     if [ -n "$bin" -a ! -e "$bin" ]; then
         echo "E: Required binary $bin not found. Please install the binary and/or edit ./vars."

diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index fe35442ca7b14c716ef68b6d6ee8b1559e32729b..a1c5585ed73ad0f9a779b308d8333c2600f0118b 100644 (file)
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -83,9 +83,6 @@ EOF
                        geoipkeydir="--geoip-dnssec-keydir=$testsdir/geosec"
                fi
 
-               base64 -d < $testsdir/GeoLiteCity.dat.b64 > $testsdir/GeoLiteCity.dat
-               base64 -d < $testsdir/GeoLiteCity.mmdb.b64 > $testsdir/GeoLiteCity.mmdb
-
                geoipdatabase=${geoipdatabase:-$testsdir/GeoLiteCity.dat}
 
                $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \