From e69f39f6e332c2b1d801706db9fb91899213e233 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 31 Mar 2016 14:51:42 +0000
Subject: [PATCH] Debian: Add build property to prevent bundling of geoip.txt
 and geoipv6.dat.gz

---
 build.properties |  4 ++++
 build.xml        | 14 ++++++++------
 debian/rules     |  1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build.properties b/build.properties
index 2cb15c4cad..56c55e9837 100644
--- a/build.properties
+++ b/build.properties
@@ -113,3 +113,7 @@ javac.version=1.6
 #bundle.routerInfos=true
 #bundle.routerInfos.count=200
 #bundle.routerInfos.i2pConfigDir=/PATH/TO/.i2p
+
+### Debian/Ubuntu packages ###
+# Don't include geoip files, we will use geoip-database package
+#with-geoip-database=true
diff --git a/build.xml b/build.xml
index 80a35b55bb..62862744e2 100644
--- a/build.xml
+++ b/build.xml
@@ -1479,12 +1479,7 @@
     </target>
 
     <!-- GeoIP files -->
-    <target name="prepgeoupdate">
-        <copy todir="pkg-temp/geoip/" >
-            <!-- We use a fileset here so it doesn't fail if the files don't exist.
-                 As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
-            <fileset dir="installer/resources" includes="geoip.txt geoipv6.dat.gz" />
-        </copy>
+    <target name="prepgeoupdate" depends="prepgeoupdate-unlesspkg" >
         <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
         <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
       <!--
@@ -1492,6 +1487,13 @@
        -->
     </target>
 
+    <!-- GeoIP files, set withGeoIPDatabase=true in override.properties to prevent -->
+    <!-- As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
+    <target name="prepgeoupdate-unlesspkg" unless="${with-geoip-database}" >
+        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
+        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
+    </target>
+
     <!-- All jetty jars required for update.
          TODO do we need to bother updating jasper?
       -->
diff --git a/debian/rules b/debian/rules
index 80cd2b5769..733d6418d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,6 +76,7 @@ endif
 	@/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
 	@/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
 	@/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
+	@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
 	@/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
 	TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
 	echo router.updateDisabled=true > $(I2P)/router.config