Changeset b79471e


Ignore:
Timestamp:
Apr 3, 2016 3:16:52 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
ae5828f
Parents:
f867a9d (diff), 18391ac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.zzz.debian' (head c630b2a47f63476018a63783a9ae2a8a58503d87)

to branch 'i2p.i2p' (head 700a07a64359e4f328d1002e559f4585c6f02f19)

Files:
7 added
17 edited
1 moved

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    rf867a9d rb79471e  
    103103   http://creativecommons.org/licenses/by-sa/3.0/
    104104   This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/
     105
     106   GeoIP API 1.3.1:
     107   See licenses/LICENSE-LGPLv2.1.txt
    105108
    106109
  • apps/i2psnark/java/build.xml

    rf867a9d rb79471e  
    1919                <pathelement location="../../ministreaming/java/build/obj" />
    2020                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
     21                <!-- jsp-api.jar only present for debian builds -->
     22                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    2123            </classpath>
    2224        </depend>
     
    3840            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
    3941            destdir="./build/obj"
    40             includeAntRuntime="false"
    41             classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" >
     42            includeAntRuntime="false" >
    4243            <compilerarg line="${javac.compilerargs}" />
     44            <classpath>
     45                <pathelement location="../../../core/java/build/i2p.jar" />
     46                <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
     47                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
     48                <!-- jsp-api.jar only present for debian builds -->
     49                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     50            </classpath>
    4351        </javac>
    4452    </target>
  • apps/i2ptunnel/java/build.xml

    rf867a9d rb79471e  
    259259                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
    260260                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
     261                <!-- jsp-api.jar only present for debian builds -->
     262                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    261263                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    262264                <pathelement location="../../jetty/jettylib/commons-el.jar" />
     
    283285                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
    284286                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
     287                <!-- jsp-api.jar only present for debian builds -->
     288                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    285289                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    286290                <pathelement location="../../jetty/jettylib/commons-el.jar" />
  • apps/jetty/build.xml

    rf867a9d rb79471e  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<project basedir="." default="all" name="jetty">
     3
     4    <!-- This copies jars, with some modifications and renaming,
     5         from the jetty-distribution directory to the jettylib directory.
     6         This is disabled if the property with-libjetty8-java=true.
     7
     8         This copies jars, with some modifications and renaming,
     9         from the apache-tomcat-deployer and apache-tomcat directories to the jettylib directory.
     10         This is disabled if the property with-libservlet2.5-java=true.
     11
     12         This also builds the small helper jar jetty-i2p.jar from
     13         the source in the java/ directory.
     14     -->
    315
    416    <property name="jetty.ver" value="8.1.17.v20150415" />
     
    2335     -->
    2436
    25     <target name="ensureJettylib" >
    26         <available property="jetty.zip.extracted" file="${jetty.base}" type="dir" />
     37    <!-- verify everything we need is in jettylib/ -->
     38    <target name="ensureJettylib" depends="ensureJettylib1, copyJettylib" />
     39
     40    <target name="ensureJettylib1" >
     41        <condition property="jetty.zip.extracted" >
     42            <or>
     43                <istrue value="${with-libjetty8-java}" />
     44                <available file="${jetty.base}" type="dir" />
     45            </or>
     46        </condition>
    2747        <condition property="jetty.zip.available" >
    2848            <or>
     
    3151            </or>
    3252        </condition>
    33         <ant target="copyJettylib" />
    34     </target>
     53    </target>
     54
    3555  <!--
    3656    <target name="ensureJettylib" depends="extractJettylib" />
     
    6383    <condition property="verified.already" >
    6484        <or>
     85            <istrue value="${with-libjetty8-java}" />
    6586            <istrue value="${jetty.zip.extracted}" />
    6687            <and>
     
    95116    </target>
    96117
    97     <target name="copyJettylib" depends="extractJettylib" >
     118    <target name="mkJettylibdir" >
    98119        <mkdir dir="jettylib" />
     120    </target>
     121
     122    <!-- Jetty and tomcat files -->
     123    <target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib" />
     124
     125    <!-- Jetty files only -->
     126    <target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty8-java}" >
    99127      <!-- We copy everything to names without the version numbers so we
    100128           can update them later. Where there was something similar in Jetty 5/6,
     
    158186        </jar>
    159187      -->
    160         <ant target="copyTomcatLib" />
    161188    </target>
    162189
     
    170197         with the JspC compiler jasper-runtime.jar below.
    171198     -->
    172     <target name="buildTomcatUtilJar" >
     199    <target name="buildTomcatUtilJar" unless="${with-libservlet2.5-java}" >
    173200        <!-- take only what we need from the tomcat-coyote jar -->
    174201        <jar destfile="${tomcat2.lib.small}/tomcat-coyote-util.jar" >
     
    193220         tomcat-api.jar + tomcat-util.jar: Add to javax.servlet.jar (as of Tomcat 7 / Jetty 8)
    194221     -->
    195     <target name="copyTomcatLib" >
     222    <target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
     223
     224    <target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
     225        <!-- EL libs.
     226             Tomcat 6 has EL 2.1.
     227             Tomcat 7 / libservlet3.0 has EL 2.2.
     228             According to http://stackoverflow.com/questions/7202686/differences-between-el-2-1-and-2-2
     229             2.2 is backwards-compatible with 2.1.
     230         -->
     231        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
     232            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
     233            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
     234        </jar>
     235    </target>
     236
     237    <target name="copyTomcatLib2" unless="${with-libtomcat6-java}" >
    196238        <jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" >
    197239            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
    198240            <zipfileset src="${tomcat2.lib.small}/tomcat-coyote-util.jar" />
    199         </jar>
    200         <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
    201             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
    202             <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
    203241        </jar>
    204242<!--
     
    216254            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
    217255        </jar>
     256    </target>
     257
     258    <target name="copyTomcatLib3" unless="${with-libtomcat7-java}" >
    218259        <jar destfile="jettylib/jasper-compiler.jar" >
    219260            <manifest>
  • apps/routerconsole/java/build.xml

    rf867a9d rb79471e  
    346346                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
    347347                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
     348                <!-- jsp-api.jar only present for debian builds -->
     349                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    348350                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    349351                <pathelement location="../../jetty/jettylib/commons-el.jar" />
     
    379381                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
    380382                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
     383                <!-- jsp-api.jar only present for debian builds -->
     384                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    381385                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    382386                <pathelement location="../../jetty/jettylib/commons-el.jar" />
  • apps/susidns/src/build.xml

    rf867a9d rb79471e  
    1212                <pathelement location="${bin}" />
    1313                <pathelement location="${lib}/javax.servlet.jar"/>
    14         <pathelement location="WEB-INF/lib/jstl.jar" />
    15         <pathelement location="WEB-INF/lib/standard.jar" />
    16         <pathelement location="${lib}/jasper-runtime.jar" />
    17         <pathelement location="${lib}/javax.servlet.jar" />
    18         <pathelement location="${lib}/commons-logging.jar" />
    19         <pathelement location="${lib}/commons-el.jar" />
    20         <pathelement location="${ant.home}/lib/ant.jar" />
    21         <pathelement location="../../../core/java/build/i2p.jar" />
     14                <!-- jsp-api.jar only present for debian builds -->
     15                <pathelement location="${lib}/jsp-api.jar" />
     16                <pathelement location="WEB-INF/lib/jstl.jar" />
     17                <pathelement location="WEB-INF/lib/standard.jar" />
     18                <pathelement location="${lib}/jasper-runtime.jar" />
     19                <pathelement location="${lib}/commons-logging.jar" />
     20                <pathelement location="${lib}/commons-el.jar" />
     21                <pathelement location="${ant.home}/lib/ant.jar" />
     22                <pathelement location="../../../core/java/build/i2p.jar" />
    2223        </path>
    2324
  • apps/susimail/build.xml

    rf867a9d rb79471e  
    2626                <pathelement location="../../core/java/build/obj" />
    2727                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
     28                <!-- jsp-api.jar only present for debian builds -->
     29                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    2830                <pathelement location="../jetty/jettylib/jetty-i2p.jar" />
    2931            </classpath>
     
    4143            <classpath>
    4244                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
     45                <!-- jsp-api.jar only present for debian builds -->
     46                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
    4347                <pathelement location="../jetty/jettylib/jetty-i2p.jar" />
    4448                <pathelement location="../../core/java/build/i2p.jar" />
  • build.properties

    rf867a9d rb79471e  
    114114#bundle.routerInfos.count=200
    115115#bundle.routerInfos.i2pConfigDir=/PATH/TO/.i2p
     116
     117### Debian/Ubuntu packages ###
     118# Don't include geoip files, we will use geoip-database package
     119#with-geoip-database=true
     120# Don't include jetty files, we will use libjetty8-java package
     121#with-libjetty8-java=true
     122# Don't include tomcat files, we will use libservlet2.5-java package
     123#with-libservlet2.5-java=true
     124# Don't include tomcat juli files, we will use libtomcat6-java package
     125#with-libtomcat6-java=true
     126# Don't build with bundled tomcat 6, we will use libtomcat7-java package
     127#with-libtomcat7-java=true
     128# Don't include standard.jar, we will use libjakarta-taglibs-standard-java package
     129#with-libjakarta-taglibs-standard-java=true
     130# Don't include jstl.jar, we will use libjstl1.1-java package
     131#with-libjstl1.1-java=true
  • build.xml

    rf867a9d rb79471e  
    700700            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:net.metanotion:net.metanotion.*:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util" />
    701701            <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
    702             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
     702            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.geoip" />
    703703            <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.update:net.i2p.router.news" />
    704704            <!-- apps and bridges starting here, alphabetical please -->
     
    765765        <echo message="Warning, javadoc embeds timestamps in the output, run with 'TZ=UTC ant javadoc' if you plan to distribute" />
    766766    </target>
     767
    767768    <target name="javadoc-zip" depends="javadoc">
    768769        <zip destfile="javadoc.zip" basedir="build" level="9" includes="javadoc\**" />
     
    10631064    </target>
    10641065
     1066    <!-- This is the target called by debian/rules -->
    10651067    <target name="preppkg-unix" depends="preppkg-base, prep-script-translation" >
    10661068        <copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
     
    11411143    </target>
    11421144
    1143     <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos">
     1145    <!-- see targets below for conditional copying -->
     1146    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg">
    11441147        <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
    11451148        <!-- Also remove deletelist.txt used for updater only -->
     
    11491152        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    11501153        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
    1151         <!-- all jetty stuff -->
    1152         <copy todir="pkg-temp/lib" >
    1153             <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
    1154         </copy>
    11551154        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
    11561155        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
     
    11711170        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
    11721171        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
    1173         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
    1174         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
    11751172        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
    11761173        <copy file="apps/i2psnark/i2psnark.config" todir="pkg-temp/" />
     
    12051202    </target>
    12061203
     1204    <target name="copyjetty" depends="copyjetty-unlesspkg" >
     1205        <copy file="build/jetty-i2p.jar" todir="pkg-temp/lib" />
     1206    </target>
     1207
     1208    <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
     1209        <copy todir="pkg-temp/lib" >
     1210            <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" excludes="jetty-i2p.jar" />
     1211        </copy>
     1212    </target>
     1213
     1214    <target name="copytomcat-unlesspkg" unless="${with-libservlet2.5-java}" >
     1215        <copy todir="pkg-temp/lib" >
     1216            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" />
     1217        </copy>
     1218    </target>
     1219
     1220    <target name="copyjstl-unlesspkg" unless="${with-libjstl1.1-java}" >
     1221        <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
     1222    </target>
     1223
     1224    <target name="copystandard-unlesspkg" unless="${with-libjakarta-taglibs-standard-java}" >
     1225        <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
     1226    </target>
     1227
    12071228    <!-- does NOT include launch4j licenses for Windows builds -->
    1208     <target name="preplicenses">
     1229    <target name="preplicenses" depends="preplicenses-unlesspkg" >
    12091230        <copy file="LICENSE.txt" todir="pkg-temp/" />
    12101231        <copy todir="pkg-temp/licenses/" >
    12111232          <fileset dir="licenses/" />
    12121233        </copy>
     1234        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
     1235    </target>
     1236
     1237    <target name="preplicenses-unlesspkg" unless="${with-libjetty8-java}" >
    12131238        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    1214         <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
    1215     </target>
    1216 
     1239    </target>
    12171240
    12181241    <!-- DOES include launch4j licenses for Windows builds -->
     
    14821505    </target>
    14831506
    1484     <!-- GeoIP files and flag icons -->
    1485     <target name="prepgeoupdate">
    1486         <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    1487         <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
     1507    <!-- GeoIP files -->
     1508    <target name="prepgeoupdate" depends="prepgeoupdate-unlesspkg" >
    14881509        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    14891510        <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
     
    14911512        <copy file="installer/resources/public-suffix-list.txt" todir="pkg-temp/geoip/" />
    14921513       -->
     1514    </target>
     1515
     1516    <!-- GeoIP files, set withGeoIPDatabase=true in override.properties to prevent -->
     1517    <!-- As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
     1518    <target name="prepgeoupdate-unlesspkg" unless="${with-geoip-database}" >
     1519        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
     1520        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    14931521    </target>
    14941522
     
    19732001        <exec executable="mtn" failonerror="true">
    19742002            <arg value="co" />
    1975             <arg value="-b" />
    1976             <arg value="i2p.i2p" />
    19772003            <!-- w: is the revision of the current workspace -->
    19782004            <arg value="-r" />
     
    19852011            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    19862012            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2013            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     2014            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2015            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2016          <!--
     2017            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     2018            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
     2019            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2020            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
     2021           -->
     2022            <!-- anything added above, add in debian-release-tarball also -->
    19872023        </delete>
    19882024        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
     
    19922028                <exclude name="debian-alt/**"/>
    19932029                <exclude name="**/*.sh"/>
     2030                <exclude name="installer/resources/geoip.txt"/>
     2031                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2032                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2033          <!--
     2034                <exclude name="apps/jetty/apache-tomcat/**"/>
     2035                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
     2036                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2037                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
     2038           -->
     2039                <!-- anything added above, add in debian-release-tarball also -->
    19942040            </tarfileset>
    19952041            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
     
    20152061        <exec executable="mtn" failonerror="true">
    20162062            <arg value="co" />
    2017             <arg value="-b" />
    2018             <arg value="i2p.i2p" />
    20192063            <!-- w: is the revision of the current workspace -->
    20202064            <arg value="-r" />
     
    20272071            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    20282072            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2073            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     2074            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2075            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2076          <!--
     2077            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     2078            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
     2079            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2080            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
     2081           -->
     2082            <!-- anything added above, add in debian-tarball also -->
    20292083        </delete>
    20302084        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
     
    20342088                <exclude name="debian-alt/**"/>
    20352089                <exclude name="**/*.sh"/>
     2090                <exclude name="installer/resources/geoip.txt"/>
     2091                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2092                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2093          <!--
     2094                <exclude name="apps/jetty/apache-tomcat/**"/>
     2095                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
     2096                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2097                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
     2098           -->
     2099                <!-- anything added above, add in debian-tarball also -->
    20362100            </tarfileset>
    20372101            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
  • debian-alt/README.txt

    rf867a9d rb79471e  
    1 The files in ../debian/ are for launchpad (trusty/utopic/vivid/wily).
     1The files in ../debian/ are for jessie/stable.
    22Alternates are in the subdirectories here.
     3
     4trusty may be copied to utopic and vivid.
     5They do not have libjetty8-java.
     6wily has libjetty8-java.
    37
    48tails-jessie and tails-wheezy are currently the same as
     
    1115# Ubuntu Saucy (and newer)
    1216
    13 Files are extracted from the following
    14 packages on deb.i2p2.no and will need to be updated
    15 for 0.9.25 or later:
    16 
    17 wheezy:
    18 i2p_0.9.23-2~deb7u+1.debian.tar.xz
    19 precise:
    20 i2p_0.9.23-2~precise+1.debian.tar.xz
    21 jessie:
    22 i2p_0.9.24-1~deb8u+1.debian.tar.xz
    23 unstable:
    24 i2p_0.9.24-1.debian.tar.xz
     17Through release 0.9.25, the debian/ directory was not current for the release;
     18any changes required for the build were checked in after the release.
     19Starting with release 0.9.26, we will attempt to test debian builds
     20before the release, and check in any required changes to debian/
     21and debian-alt/ before the release, so that the files
     22may actually be used to build the release.
  • debian-alt/trusty/changelog

    rf867a9d rb79471e  
    1 i2p (0.9.25-1~deb8u+1) stable; urgency=medium
    2 
    3   * Backport to Jessie
    4 
    5  -- zzz on i2p <zzz@i2pmail.org>  Tue, 29 Mar 2016 18:12:12 +0000
     1i2p (0.9.25-1ubuntu1) trusty; urgency=medium
     2
     3  * New upstream version 0.9.25
     4
     5 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Sat, 26 Mar 2016 12:12:12 +0000
     6
     7i2p (0.9.24-1ubuntu1) trusty; urgency=medium
     8
     9  * Upload to PPA
     10
     11 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 30 Jan 2016 14:12:27 +0000
    612
    713i2p (0.9.24-1) unstable; urgency=medium
     
    113119
    114120 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 20 Jun 2015 11:22:28 +0000
    115 
    116121i2p (0.9.20-2) unstable; urgency=medium
    117122
     
    327332    - Update GeoIP data
    328333
    329  -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 01 Nov 2014 23:34:28 +0000
    330 
    331334i2p (0.9.15-1) unstable; urgency=medium
    332335
    333   * New Upstream Version
     336  * New Upstream release
    334337    - Add support for Ed25519 signatures
    335338    - i2psnark move to separate config file for each torrent to better support
     
    368371      + Fix update buttons
    369372      + Don't filter parameter names starting with "nofilter_"
    370       + Re-allow configadvanced, news URL, and unsigned update URL if routerconsole.advanced=true
    371       + Re-allow plugin install if routerconsole.advanced=true or routerconsole.enablePluginInstall=true
    372       + Only allow whitelisted plugin signers, unless routerconsole.allowUntrustedPlugins=true
    373       + Re-allow clients.config changes if routerconsole.advanced=true or routerconsole.enableClientChange=true
     373      + Re-allow configadvanced, news URL, and unsigned update URL if
     374        routerconsole.advanced=true
     375      + Re-allow plugin install if routerconsole.advanced=true or
     376        routerconsole.enablePluginInstall=true
     377      + Only allow whitelisted plugin signers, unless
     378        routerconsole.allowUntrustedPlugins=true
     379      + Re-allow clients.config changes if routerconsole.advanced=true or
     380        routerconsole.enableClientChange=true
    374381      + More escaping
    375382    - i2psnark: Fix add torrent form
     
    395402      for better compatibility with Vuze
    396403  * Other
    397     - Reseeding now fetches a signed zip file containing router infos for security and speed
     404    - Reseeding now fetches a signed zip file containing router infos for
     405      security and speed
    398406    - Use JVM's AES implementation if it is faster
    399407    - More advanced options shown in the i2ptunnel edit pages
    400     - Per-message reliabilitiy settings in I2CP and error propagation back from router to client
     408    - Per-message reliabilitiy settings in I2CP and error propagation back
     409      from router to client
    401410    - Lots of findbugs fixes and cleanups
    402411    - Support signature types in SAM, bump rev to 3.1
     
    440449i2p (0.9.11-1) unstable; urgency=medium
    441450
    442   * New Upstream Version
    443   * Debconf: New Japanese and Korean translations
    444 
    445  -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 08 Feb 2014 22:31:59 +0000
     451  * New release
     452  * Debconf: New Korean and Polish translations
     453
     454 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 09 Feb 2014 00:00:00 +0000
    446455
    447456i2p (0.9.10-1) unstable; urgency=medium
    448457
    449   * New Upstream Version
     458  * New release
    450459  * Remove /var/lib/i2p when i2p package is purged.
    451460  * Bump standards version to 3.9.5 (no changes needed)
     
    453462 -- Kill Your TV <killyourtv@i2pmail.org>  Wed, 22 Jan 2014 16:00:24 +0000
    454463
    455 i2p (0.9.9-1deb8u1) unstable; urgency=medium
    456 
    457   * New Upstream Version
    458   * Drop from debian/patches (already in 0.9.9):
    459     - 0006-allow-webapps-to-be-preseeded.patch
    460     - 0007-geoipv6-fix.patch
    461     - 0008-IPv6-categories-in-netdb.patch
    462     - 0009-mark-ipv6-only-as-experimental.patch
    463     - 0010-snark-start-torrent-by-default.patch
    464     - 0011-fix-start-and-start-all-buttons.patch
    465     - 0012-add-no.i2p-registrar.patch
    466     - 0013-persistent-keying-for-SOCKS-tunnels.patch
    467     - 0014-post-limiter.patch
    468     - 0015-home-remove-config-when-restoring-default.patch
    469     - 0016-new-netdb-categories.patch
    470     - 0017-updated-trac-links.patch
     464i2p (0.9.9-1) unstable; urgency=medium
     465
     466  * New Upstream release
    471467  * debconf:
    472468    - Updated French translation
     
    475471 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 07 Dec 2013 18:17:24 +0000
    476472
    477 i2p (0.9.8.1-deb8u1) stable; urgency=low
    478 
    479   * Change initscript to grant read/write permissions to members of the i2psvc
    480     group.
    481   * Postinst: Silence a misleading warning
    482 
    483  -- Kill Your TV <killyourtv@i2pmail.org>  Thu, 07 Nov 2013 00:22:48 +0000
    484 
    485 i2p (0.9.8.1-1deb1) stable; urgency=low
    486 
    487   * New upstream version 0.9.8.1. Initially I was not going to build 0.9.8.1
    488     packages since 0.9.8.1 was a Windows-only point release but I thought it
    489     would be good to have it in Tails. At the same time we may as well
    490     cherry-pick some easy bugfixes/updates from mtn.
    491   * debian/rules: Set the builddistribution specific versions
    492   * use xz for the 'debian' quilt 3.0 tarball
    493   * Cherry-picked fixes/updates:
    494     - Allow webapps.config to be preseeded by distributions
    495     - IPv6:
    496       + GeoIPv6 fixes (ticket #1096)
    497       + Add IPv6 NetDB categories
    498       + Mark IPv6-only as experimental
    499     - I2PSnark:
    500       + Start torrent by default
    501       + Fix start and start-all buttons on text browsers and Opera
    502         (ticket #1093)
    503     - I2PTunnel:
    504       + Post limiter
    505       + Persistent keying for SOCKS tunnels (ticket #1088)
    506     - Add no.i2p registrar
    507     - Remove config when restoring default settings
    508     - Additional NetDB categories
    509     - Change Trac links to HTTPS
    510 
    511  -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 05 Nov 2013 17:34:38 +0000
    512 
    513 i2p (0.9.8-1) stable; urgency=low
     473i2p (0.9.8-1) unstable; urgency=low
    514474
    515475  * New Upstream Version
     
    518478 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 30 Sep 2013 16:14:40 +0000
    519479
    520 i2p (0.9.7.1-1) stable; urgency=low
     480i2p (0.9.7.1-1) unstable; urgency=low
    521481
    522482  * New upstream version 0.9.7.1
    523483  * Compress packages with xz
    524484
    525  -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 10 Aug 2013 19:02:24 +0000
     485 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 10 Aug 2013 22:10:08 +0000
    526486
    527487i2p (0.9.7-2) unstable; urgency=low
    528488
    529489  * Bugfix: Add missing ; to i2prouter script.
     490  * Test scripts with "sh -n" in the build target
    530491
    531492 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 16 Jul 2013 11:08:48 +0000
     
    543504
    544505  * New upstream release
    545 
    546  -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 23:18:54 +0000
     506  * i2prouter: allow overrides to be set in /etc/default/i2p
     507
     508 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 00:00:00 +0000
    547509
    548510i2p (0.9.5-2) unstable; urgency=low
    549511
    550512  * debian/i2p.postinst: Explicitly set permissions on /etc/i2p/wrapper.config
    551     to compensate for stricter umasks. Fixes #906.
    552 
    553  -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 31 Mar 2013 12:53:43 +0000
     513    to compensate for stricter umasks.
     514
     515 -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 31 Mar 2013 12:50:17 +0000
    554516
    555517i2p (0.9.5-1) unstable; urgency=low
     
    562524 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 08 Mar 2013 23:04:51 +0000
    563525
    564 i2p (0.9.4+repack-3) unstable; urgency=low
     526i2p (0.9.4-3) unstable; urgency=low
    565527
    566528  * Backport fix from MTN for ticket #817
     
    568530 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 22 Dec 2012 13:07:47 +0000
    569531
    570 i2p (0.9.4+repack-2) unstable; urgency=low
     532i2p (0.9.4-2) unstable; urgency=low
    571533
    572534  * Add missing build-dep on libservice-wrapper-java
     
    574536 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 17 Dec 2012 20:40:07 +0000
    575537
    576 i2p (0.9.4+repack-1) unstable; urgency=low
     538i2p (0.9.4-1) stable; urgency=low
    577539
    578540  * explicitly prefer openjdk-*-headless over default-jre-headless. Debian
     
    611573 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 17 Dec 2012 23:59:59 +0000
    612574
    613 i2p (0.9.3+repack-1) unstable; urgency=low
     575i2p (0.9.3-1) stable; urgency=low
    614576
    615577  * New Upstream release
    616   * Upstream changelog:
     578  * Upstream changelog (full details in history.txt):
    617579    - Active Queue Management
    618580    - I2PSnark DHT: Several bug fixes, enable by default.
     
    645607 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 27 Oct 2012 16:47:37 +0000
    646608
    647 i2p (0.9.2+repack-2) unstable; urgency=high
     609i2p (0.9.2-2) stable; urgency=high
    648610
    649611  * Fix stupid bug in i2prouter
     
    651613 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 22 Sep 2012 13:57:39 +0000
    652614
    653 i2p (0.9.2+repack-1) stable; urgency=low
     615i2p (0.9.2-1) stable; urgency=low
    654616
    655617  * New upstream release (see history.txt for details)
     
    657619 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 21 Sep 2012 18:13:32 +0000
    658620
    659 i2p (0.9.1+repack-1) unstable; urgency=low
     621i2p (0.9.1-1) stable; urgency=low
    660622
    661623  * New upstream version 0.9.1
     
    672634 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 30 Jul 2012 17:41:04 +0000
    673635
    674 i2p (0.9-1) unstable; urgency=low
     636i2p (0.9-1) stable; urgency=low
    675637
    676638  * New Upstream Version
     
    678640 -- Kill Your TV <killyourtv@i2pmail.org>  Wed, 02 May 2012 16:33:11 +0000
    679641
    680 i2p (0.8.13-2) unstable; urgency=low
     642i2p (0.8.13-2) stable; urgency=low
    681643
    682644  * Fix bug in postinst cause by changes to adduser's behaviour.
     
    725687 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 06 Jan 2012 02:49:03 +0000
    726688
    727 i2p (0.8.11+repack-2) stable; urgency=medium
     689i2p (0.8.11-2) stable; urgency=medium
    728690
    729691  * Fix STUPID bug running I2P with i2prouter. Thanks soundwave.
     
    731693 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 08 Nov 2011 20:02:05 +0000
    732694
    733 i2p (0.8.11+repack-1) stable; urgency=low
     695i2p (0.8.11-1) stable; urgency=low
    734696
    735697  * New Upstream Version
     
    738700 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 07 Nov 2011 19:20:15 +0000
    739701
    740 i2p (0.8.10+repack-1) stable; urgency=medium
     702i2p (0.8.10-1) stable; urgency=medium
    741703
    742704  * New upstream version
     
    744706 -- Kill Your TV <killyourtv@i2pmail.org>  Thu, 20 Oct 2011 05:25:04 +0000
    745707
    746 i2p (0.8.9+repack-1) stable; urgency=medium
     708i2p (0.8.9-1) stable; urgency=medium
    747709
    748710  * New upstream version
     
    750712 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 11 Oct 2011 19:55:08 +0000
    751713
    752 i2p (0.8.8+repack-3) UNRELEASED; urgency=low
     714i2p (0.8.8-3) UNRELEASED; urgency=low
    753715
    754716  * Add dump option to initscript
     
    756718 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 06 Sep 2011 12:42:22 +0000
    757719
    758 i2p (0.8.8+repack-2) stable; urgency=medium
     720i2p (0.8.8-2) stable; urgency=medium
    759721
    760722  * Backport patch from mtn 04ec606 to fix trac #515
     
    766728 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 02 Sep 2011 23:32:32 +0000
    767729
    768 i2p (0.8.8+repack-1) stable; urgency=low
     730i2p (0.8.8-1) stable; urgency=low
    769731
    770732  * New Upstream Version
  • debian/changelog

    rf867a9d rb79471e  
    1 i2p (0.9.25-1ubuntu1) trusty; urgency=medium
    2 
    3   * New upstream version 0.9.25
    4 
    5  -- zzz on i2p (key signing) <zzz@i2pmail.org>  Sat, 26 Mar 2016 12:12:12 +0000
    6 
    7 i2p (0.9.24-1ubuntu1) trusty; urgency=medium
    8 
    9   * Upload to PPA
    10 
    11  -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 30 Jan 2016 14:12:27 +0000
     1i2p (0.9.25-1~deb8u+1) stable; urgency=medium
     2
     3  * Backport to Jessie
     4
     5 -- zzz on i2p <zzz@i2pmail.org>  Tue, 29 Mar 2016 18:12:12 +0000
    126
    137i2p (0.9.24-1) unstable; urgency=medium
     
    119113
    120114 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 20 Jun 2015 11:22:28 +0000
     115
    121116i2p (0.9.20-2) unstable; urgency=medium
    122117
     
    332327    - Update GeoIP data
    333328
     329 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 01 Nov 2014 23:34:28 +0000
     330
    334331i2p (0.9.15-1) unstable; urgency=medium
    335332
    336   * New Upstream release
     333  * New Upstream Version
    337334    - Add support for Ed25519 signatures
    338335    - i2psnark move to separate config file for each torrent to better support
     
    371368      + Fix update buttons
    372369      + Don't filter parameter names starting with "nofilter_"
    373       + Re-allow configadvanced, news URL, and unsigned update URL if
    374         routerconsole.advanced=true
    375       + Re-allow plugin install if routerconsole.advanced=true or
    376         routerconsole.enablePluginInstall=true
    377       + Only allow whitelisted plugin signers, unless
    378         routerconsole.allowUntrustedPlugins=true
    379       + Re-allow clients.config changes if routerconsole.advanced=true or
    380         routerconsole.enableClientChange=true
     370      + Re-allow configadvanced, news URL, and unsigned update URL if routerconsole.advanced=true
     371      + Re-allow plugin install if routerconsole.advanced=true or routerconsole.enablePluginInstall=true
     372      + Only allow whitelisted plugin signers, unless routerconsole.allowUntrustedPlugins=true
     373      + Re-allow clients.config changes if routerconsole.advanced=true or routerconsole.enableClientChange=true
    381374      + More escaping
    382375    - i2psnark: Fix add torrent form
     
    402395      for better compatibility with Vuze
    403396  * Other
    404     - Reseeding now fetches a signed zip file containing router infos for
    405       security and speed
     397    - Reseeding now fetches a signed zip file containing router infos for security and speed
    406398    - Use JVM's AES implementation if it is faster
    407399    - More advanced options shown in the i2ptunnel edit pages
    408     - Per-message reliabilitiy settings in I2CP and error propagation back
    409       from router to client
     400    - Per-message reliabilitiy settings in I2CP and error propagation back from router to client
    410401    - Lots of findbugs fixes and cleanups
    411402    - Support signature types in SAM, bump rev to 3.1
     
    449440i2p (0.9.11-1) unstable; urgency=medium
    450441
    451   * New release
    452   * Debconf: New Korean and Polish translations
    453 
    454  -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 09 Feb 2014 00:00:00 +0000
     442  * New Upstream Version
     443  * Debconf: New Japanese and Korean translations
     444
     445 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 08 Feb 2014 22:31:59 +0000
    455446
    456447i2p (0.9.10-1) unstable; urgency=medium
    457448
    458   * New release
     449  * New Upstream Version
    459450  * Remove /var/lib/i2p when i2p package is purged.
    460451  * Bump standards version to 3.9.5 (no changes needed)
     
    462453 -- Kill Your TV <killyourtv@i2pmail.org>  Wed, 22 Jan 2014 16:00:24 +0000
    463454
    464 i2p (0.9.9-1) unstable; urgency=medium
    465 
    466   * New Upstream release
     455i2p (0.9.9-1deb8u1) unstable; urgency=medium
     456
     457  * New Upstream Version
     458  * Drop from debian/patches (already in 0.9.9):
     459    - 0006-allow-webapps-to-be-preseeded.patch
     460    - 0007-geoipv6-fix.patch
     461    - 0008-IPv6-categories-in-netdb.patch
     462    - 0009-mark-ipv6-only-as-experimental.patch
     463    - 0010-snark-start-torrent-by-default.patch
     464    - 0011-fix-start-and-start-all-buttons.patch
     465    - 0012-add-no.i2p-registrar.patch
     466    - 0013-persistent-keying-for-SOCKS-tunnels.patch
     467    - 0014-post-limiter.patch
     468    - 0015-home-remove-config-when-restoring-default.patch
     469    - 0016-new-netdb-categories.patch
     470    - 0017-updated-trac-links.patch
    467471  * debconf:
    468472    - Updated French translation
     
    471475 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 07 Dec 2013 18:17:24 +0000
    472476
    473 i2p (0.9.8-1) unstable; urgency=low
     477i2p (0.9.8.1-deb8u1) stable; urgency=low
     478
     479  * Change initscript to grant read/write permissions to members of the i2psvc
     480    group.
     481  * Postinst: Silence a misleading warning
     482
     483 -- Kill Your TV <killyourtv@i2pmail.org>  Thu, 07 Nov 2013 00:22:48 +0000
     484
     485i2p (0.9.8.1-1deb1) stable; urgency=low
     486
     487  * New upstream version 0.9.8.1. Initially I was not going to build 0.9.8.1
     488    packages since 0.9.8.1 was a Windows-only point release but I thought it
     489    would be good to have it in Tails. At the same time we may as well
     490    cherry-pick some easy bugfixes/updates from mtn.
     491  * debian/rules: Set the builddistribution specific versions
     492  * use xz for the 'debian' quilt 3.0 tarball
     493  * Cherry-picked fixes/updates:
     494    - Allow webapps.config to be preseeded by distributions
     495    - IPv6:
     496      + GeoIPv6 fixes (ticket #1096)
     497      + Add IPv6 NetDB categories
     498      + Mark IPv6-only as experimental
     499    - I2PSnark:
     500      + Start torrent by default
     501      + Fix start and start-all buttons on text browsers and Opera
     502        (ticket #1093)
     503    - I2PTunnel:
     504      + Post limiter
     505      + Persistent keying for SOCKS tunnels (ticket #1088)
     506    - Add no.i2p registrar
     507    - Remove config when restoring default settings
     508    - Additional NetDB categories
     509    - Change Trac links to HTTPS
     510
     511 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 05 Nov 2013 17:34:38 +0000
     512
     513i2p (0.9.8-1) stable; urgency=low
    474514
    475515  * New Upstream Version
     
    478518 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 30 Sep 2013 16:14:40 +0000
    479519
    480 i2p (0.9.7.1-1) unstable; urgency=low
     520i2p (0.9.7.1-1) stable; urgency=low
    481521
    482522  * New upstream version 0.9.7.1
    483523  * Compress packages with xz
    484524
    485  -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 10 Aug 2013 22:10:08 +0000
     525 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 10 Aug 2013 19:02:24 +0000
    486526
    487527i2p (0.9.7-2) unstable; urgency=low
    488528
    489529  * Bugfix: Add missing ; to i2prouter script.
    490   * Test scripts with "sh -n" in the build target
    491530
    492531 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 16 Jul 2013 11:08:48 +0000
     
    504543
    505544  * New upstream release
    506   * i2prouter: allow overrides to be set in /etc/default/i2p
    507 
    508  -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 00:00:00 +0000
     545
     546 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 23:18:54 +0000
    509547
    510548i2p (0.9.5-2) unstable; urgency=low
    511549
    512550  * debian/i2p.postinst: Explicitly set permissions on /etc/i2p/wrapper.config
    513     to compensate for stricter umasks.
    514 
    515  -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 31 Mar 2013 12:50:17 +0000
     551    to compensate for stricter umasks. Fixes #906.
     552
     553 -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 31 Mar 2013 12:53:43 +0000
    516554
    517555i2p (0.9.5-1) unstable; urgency=low
     
    524562 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 08 Mar 2013 23:04:51 +0000
    525563
    526 i2p (0.9.4-3) unstable; urgency=low
     564i2p (0.9.4+repack-3) unstable; urgency=low
    527565
    528566  * Backport fix from MTN for ticket #817
     
    530568 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 22 Dec 2012 13:07:47 +0000
    531569
    532 i2p (0.9.4-2) unstable; urgency=low
     570i2p (0.9.4+repack-2) unstable; urgency=low
    533571
    534572  * Add missing build-dep on libservice-wrapper-java
     
    536574 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 17 Dec 2012 20:40:07 +0000
    537575
    538 i2p (0.9.4-1) stable; urgency=low
     576i2p (0.9.4+repack-1) unstable; urgency=low
    539577
    540578  * explicitly prefer openjdk-*-headless over default-jre-headless. Debian
     
    573611 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 17 Dec 2012 23:59:59 +0000
    574612
    575 i2p (0.9.3-1) stable; urgency=low
     613i2p (0.9.3+repack-1) unstable; urgency=low
    576614
    577615  * New Upstream release
    578   * Upstream changelog (full details in history.txt):
     616  * Upstream changelog:
    579617    - Active Queue Management
    580618    - I2PSnark DHT: Several bug fixes, enable by default.
     
    607645 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 27 Oct 2012 16:47:37 +0000
    608646
    609 i2p (0.9.2-2) stable; urgency=high
     647i2p (0.9.2+repack-2) unstable; urgency=high
    610648
    611649  * Fix stupid bug in i2prouter
     
    613651 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 22 Sep 2012 13:57:39 +0000
    614652
    615 i2p (0.9.2-1) stable; urgency=low
     653i2p (0.9.2+repack-1) stable; urgency=low
    616654
    617655  * New upstream release (see history.txt for details)
     
    619657 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 21 Sep 2012 18:13:32 +0000
    620658
    621 i2p (0.9.1-1) stable; urgency=low
     659i2p (0.9.1+repack-1) unstable; urgency=low
    622660
    623661  * New upstream version 0.9.1
     
    634672 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 30 Jul 2012 17:41:04 +0000
    635673
    636 i2p (0.9-1) stable; urgency=low
     674i2p (0.9-1) unstable; urgency=low
    637675
    638676  * New Upstream Version
     
    640678 -- Kill Your TV <killyourtv@i2pmail.org>  Wed, 02 May 2012 16:33:11 +0000
    641679
    642 i2p (0.8.13-2) stable; urgency=low
     680i2p (0.8.13-2) unstable; urgency=low
    643681
    644682  * Fix bug in postinst cause by changes to adduser's behaviour.
     
    687725 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 06 Jan 2012 02:49:03 +0000
    688726
    689 i2p (0.8.11-2) stable; urgency=medium
     727i2p (0.8.11+repack-2) stable; urgency=medium
    690728
    691729  * Fix STUPID bug running I2P with i2prouter. Thanks soundwave.
     
    693731 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 08 Nov 2011 20:02:05 +0000
    694732
    695 i2p (0.8.11-1) stable; urgency=low
     733i2p (0.8.11+repack-1) stable; urgency=low
    696734
    697735  * New Upstream Version
     
    700738 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 07 Nov 2011 19:20:15 +0000
    701739
    702 i2p (0.8.10-1) stable; urgency=medium
     740i2p (0.8.10+repack-1) stable; urgency=medium
    703741
    704742  * New upstream version
     
    706744 -- Kill Your TV <killyourtv@i2pmail.org>  Thu, 20 Oct 2011 05:25:04 +0000
    707745
    708 i2p (0.8.9-1) stable; urgency=medium
     746i2p (0.8.9+repack-1) stable; urgency=medium
    709747
    710748  * New upstream version
     
    712750 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 11 Oct 2011 19:55:08 +0000
    713751
    714 i2p (0.8.8-3) UNRELEASED; urgency=low
     752i2p (0.8.8+repack-3) UNRELEASED; urgency=low
    715753
    716754  * Add dump option to initscript
     
    718756 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 06 Sep 2011 12:42:22 +0000
    719757
    720 i2p (0.8.8-2) stable; urgency=medium
     758i2p (0.8.8+repack-2) stable; urgency=medium
    721759
    722760  * Backport patch from mtn 04ec606 to fix trac #515
     
    728766 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 02 Sep 2011 23:32:32 +0000
    729767
    730 i2p (0.8.8-1) stable; urgency=low
     768i2p (0.8.8+repack-1) stable; urgency=low
    731769
    732770  * New Upstream Version
  • debian/control

    rf867a9d rb79471e  
    1111 ,debconf
    1212 ,openjdk-7-jdk
     13 ,libjetty8-java, libservlet3.0-java
    1314 ,dh-apparmor
    1415 ,gettext
     
    7172Priority: optional
    7273Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    73  openjdk-8-jre-headless | openjdk-7-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless, libecj-java
     74 openjdk-8-jre-headless | openjdk-7-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless,
     75 libecj-java,
     76 geoip-database,
     77 libjetty8-java, libservlet3.0-java
    7478Replaces: i2p ( << 0.8.6-5)
    7579Breaks: i2p (<< 0.8.6-5)
  • debian/i2p-router.install

    rf867a9d rb79471e  
    2121
    2222pkg-temp/lib/BOB.jar usr/share/i2p/lib
    23 pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    24 pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
    2523pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
    2624pkg-temp/lib/i2p.jar usr/share/i2p/lib
    2725pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
    2826pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
    29 pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
    30 pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
    31 pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
    32 pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
    33 pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
    3427pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
    35 pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
    36 pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
    37 pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
    38 pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
    39 pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
    40 pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
    41 pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
    42 pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
    43 pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
    4428pkg-temp/lib/jrobin.jar usr/share/i2p/lib
    45 pkg-temp/lib/jstl.jar usr/share/i2p/lib
    4629pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
    47 pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
    48 pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
    4930pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
    5031pkg-temp/lib/router.jar usr/share/i2p/lib
    5132pkg-temp/lib/sam.jar usr/share/i2p/lib
    52 pkg-temp/lib/standard.jar usr/share/i2p/lib
    5333pkg-temp/lib/streaming.jar usr/share/i2p/lib
    5434pkg-temp/lib/systray4j.jar usr/share/i2p/lib
    5535pkg-temp/lib/systray.jar usr/share/i2p/lib
     36
     37
     38# uncomment if not building with libjetty8-java
     39# ubuntu: only in wily
     40# debian: in wheezy jessie stretch sid
     41#pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
     42#pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
     43#pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
     44#pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
     45#pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
     46#pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
     47#pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
     48#pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
     49#pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
     50#pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
     51#pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
     52#pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
     53#pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
     54#pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
     55# following two are from libservlet3.0-java which is a dependency of libjetty8-java
     56#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
     57
     58
     59# uncomment if not building with libservlet2.5-java
     60# ubuntu: only in wily
     61# debian: in wheezy jessie stretch sid
     62pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     63
     64
     65# uncomment if not building with libtomcat6-java
     66# ubuntu: only in precise trusty vivid
     67# debian: only in wheezy
     68# todo: see if libtomcat7-java will work
     69# legacy name, contains only tomcat-juli, not commons-logging
     70pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
     71pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     72
     73
     74# uncomment if not building with libjakarta-taglibs-standard-java
     75# ubuntu: only in wily
     76# debian: in wheezy jessie stretch sid
     77pkg-temp/lib/jstl.jar usr/share/i2p/lib
     78
     79
     80# uncomment if not building with libjstl1.1-java
     81# ubuntu: in precise trusty vivid wily xenial
     82# debian: in wheezy jessie stretch sid
     83pkg-temp/lib/standard.jar usr/share/i2p/lib
  • debian/i2p-router.links

    rf867a9d rb79471e  
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
    55
    6 usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
     6usr/share/java/eclipse-ecj.jar /usr/share/i2p/lib/eclipse-ecj.jar
     7
     8
     9# comment out if not building with libjetty8-java
     10# ubuntu: only in wily
     11# debian: in wheezy jessie stretch sid
     12usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
     13usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
     14usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
     15usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
     16# legacy name in lib/
     17usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
     18usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
     19usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
     20usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
     21usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
     22usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
     23usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
     24usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
     25# legacy name in lib/
     26usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
     27# legacy name in lib/
     28usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
     29# following two are from libservlet3.0-java which is a dependency of libjetty8-java
     30# legacy name in lib/
     31usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
     32# combined into javax.servlet.jar in non-package builds
     33usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
     34
     35
     36# comment out if not building with libservlet2.5-java
     37# ubuntu: only in wily
     38# debian: in wheezy jessie stretch sid
     39#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
     40
     41
     42# comment out if not building with libtomcat6-java
     43# ubuntu: only in precise trusty vivid
     44# debian: only in wheezy
     45# todo: see if libtomcat7-java will work
     46# legacy name, contains only tomcat-juli, not commons-logging
     47#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
     48#usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     49# combined into jasper-runtime.jar in non-package builds
     50#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     51
     52
     53# comment out if not building with libjakarta-taglibs-standard-java
     54# ubuntu: only in wily
     55# debian: in wheezy jessie stretch sid
     56#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
     57
     58
     59# comment out if not building with libjstl1.1-java
     60# ubuntu: in precise trusty vivid wily xenial
     61# debian: in wheezy jessie stretch sid
     62#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
  • debian/repack.sh

    rf867a9d rb79471e  
    3030                        --delete '*/Slackware/*' \
    3131                        --delete '*/debian-alt/*' \
     32                        --delete '*/installer/resources/geoip.txt' \
     33                        --delete '*/installer/resources/geoipv6.dat.gz' \
     34                        --delete '*/apps/jetty/apache-tomcat/*' \
     35                        --delete '*/apps/jetty/apache-tomcat-deployer/*' \
     36                        --delete '*/apps/jetty/jetty-distribution-*/*' \
     37                        --delete '*/apps/susidns/src/WEB-INF/lib/jstl.jar' \
     38                        --delete '*/apps/susidns/src/WEB-INF/lib/standard.jar' \
    3239                        --delete '*/debian/*' > "$tdir/${fname}"
    3340
  • debian/rules

    rf867a9d rb79471e  
    7878        @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
    7979        @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
     80
     81        # debian and ubuntu: everywhere
     82        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
     83
     84        # ubuntu: only in wily
     85        # debian: in wheezy jessie stretch sid
     86        @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
     87        mkdir -p $(CURDIR)/apps/jetty/jettylib
     88        ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
     89        ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     90        ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
     91        ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
     92        ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
     93        ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
     94        ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
     95        ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
     96        ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
     97        ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
     98        ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
     99        ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
     100        ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
     101        ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     102        # following two are from libservlet3.0-java which is a dependency of libjetty8-java
     103        ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     104        ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     105
     106        # ubuntu: only in wily
     107        # debian: in wheezy jessie stretch sid
     108        #mkdir -p $(CURDIR)/apps/jetty/jettylib
     109        #@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
     110        #ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     111
     112        # ubuntu: only in precise trusty vivid
     113        # debian: only in wheezy
     114        #@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
     115        #mkdir -p $(CURDIR)/apps/jetty/jettylib
     116        #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
     117        #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     118        #ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     119        #ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     120
     121        # debian and ubuntu: everywhere
     122        #@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
     123        #mkdir -p $(CURDIR)/apps/jetty/jettylib
     124        #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
     125        #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     126        #ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     127        #ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     128
     129        # ubuntu: only in wily
     130        # debian: in wheezy jessie stretch sid
     131        #@/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
     132        #ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
     133
     134        # debian and ubuntu: everywhere
     135        #@/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
     136        #ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
     137
    80138        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
    81139        echo router.updateDisabled=true > $(I2P)/router.config
  • router/java/src/net/i2p/router/transport/GeoIP.java

    rf867a9d rb79471e  
    1717import java.util.concurrent.atomic.AtomicBoolean;
    1818
     19import com.maxmind.geoip.InvalidDatabaseException;
     20import com.maxmind.geoip.LookupService;
     21
    1922import net.i2p.I2PAppContext;
    2023import net.i2p.data.DataHelper;
     
    2528import net.i2p.util.ConcurrentHashSet;
    2629import net.i2p.util.Log;
     30import net.i2p.util.SystemVersion;
    2731
    2832/**
     
    5761    private int _lookupRunCount;
    5862   
     63    static final String PROP_GEOIP_ENABLED = "routerconsole.geoip.enable";
     64    public static final String PROP_GEOIP_DIR = "geoip.dir";
     65    public static final String GEOIP_DIR_DEFAULT = "geoip";
     66    static final String GEOIP_FILE_DEFAULT = "geoip.txt";
     67    static final String COUNTRY_FILE_DEFAULT = "countries.txt";
     68    public static final String PROP_IP_COUNTRY = "i2np.lastCountry";
     69    public static final String PROP_DEBIAN_GEOIP = "geoip.dat";
     70    public static final String PROP_DEBIAN_GEOIPV6 = "geoip.v6.dat";
     71    private static final String DEBIAN_GEOIP_FILE = "/usr/share/GeoIP/GeoIP.dat";
     72    private static final String DEBIAN_GEOIPV6_FILE = "/usr/share/GeoIP/GeoIPv6.dat";
     73    private static final boolean ENABLE_DEBIAN = !SystemVersion.isWindows();
     74    /** maxmind API */
     75    private static final String UNKNOWN_COUNTRY_CODE = "--";
     76
    5977    /**
    6078     *  @param context RouterContext in production, I2PAppContext for testing only
     
    7290        readCountryFile();
    7391    }
    74    
    75     static final String PROP_GEOIP_ENABLED = "routerconsole.geoip.enable";
    76     public static final String PROP_GEOIP_DIR = "geoip.dir";
    77     public static final String GEOIP_DIR_DEFAULT = "geoip";
    78     static final String GEOIP_FILE_DEFAULT = "geoip.txt";
    79     static final String COUNTRY_FILE_DEFAULT = "countries.txt";
    80     public static final String PROP_IP_COUNTRY = "i2np.lastCountry";
    8192
    8293    /**
     
    146157                if (search.length > 0) {
    147158                    Arrays.sort(search);
    148                     String[] countries = readGeoIPFile(search);
    149                     for (int i = 0; i < countries.length; i++) {
    150                         if (countries[i] != null)
    151                             _IPToCountry.put(search[i], countries[i]);
    152                         else
    153                             _notFound.add(search[i]);
     159                    File f = new File(_context.getProperty(PROP_DEBIAN_GEOIP, DEBIAN_GEOIP_FILE));
     160                    if (ENABLE_DEBIAN && f.exists()) {
     161                        // Maxmind database
     162                        LookupService ls = null;
     163                        try {
     164                            ls = new LookupService(f, LookupService.GEOIP_STANDARD);
     165                            for (int i = 0; i < search.length; i++) {
     166                                long ip = search[i].longValue();
     167                                // returns upper case or "--"
     168                                String uc = ls.getCountry(ip).getCode();
     169                                if (!uc.equals(UNKNOWN_COUNTRY_CODE)) {
     170                                    String cached = _codeCache.get(uc.toLowerCase(Locale.US));
     171                                    _IPToCountry.put(search[i], cached);
     172                                } else {
     173                                    _notFound.add(search[i]);
     174                                }
     175                            }
     176                        } catch (IOException ioe) {
     177                            _log.error("GeoIP failure", ioe);
     178                        } catch (InvalidDatabaseException ide) {
     179                            _log.error("GeoIP failure", ide);
     180                        } finally {
     181                            if (ls != null) ls.close();
     182                        }
     183                    } else {
     184                        // Tor-style database
     185                        String[] countries = readGeoIPFile(search);
     186                        for (int i = 0; i < countries.length; i++) {
     187                            if (countries[i] != null)
     188                                _IPToCountry.put(search[i], countries[i]);
     189                            else
     190                                _notFound.add(search[i]);
     191                        }
    154192                    }
    155193                }
     
    159197                if (search.length > 0) {
    160198                    Arrays.sort(search);
    161                     String[] countries = GeoIPv6.readGeoIPFile(_context, search, _codeCache);
    162                     for (int i = 0; i < countries.length; i++) {
    163                         if (countries[i] != null)
    164                             _IPToCountry.put(search[i], countries[i]);
    165                         else
    166                             _notFound.add(search[i]);
     199                    File f = new File(_context.getProperty(PROP_DEBIAN_GEOIPV6, DEBIAN_GEOIPV6_FILE));
     200                    if (ENABLE_DEBIAN && f.exists()) {
     201                        // Maxmind database
     202                        LookupService ls = null;
     203                        try {
     204                            ls = new LookupService(f, LookupService.GEOIP_STANDARD);
     205                            for (int i = 0; i < search.length; i++) {
     206                                long ip = search[i].longValue();
     207                                String ipv6 = toV6(ip);
     208                                // returns upper case or "--"
     209                                String uc = ls.getCountryV6(ipv6).getCode();
     210                                if (!uc.equals(UNKNOWN_COUNTRY_CODE)) {
     211                                    String cached = _codeCache.get(uc.toLowerCase(Locale.US));
     212                                    _IPToCountry.put(search[i], cached);
     213                                } else {
     214                                    _notFound.add(search[i]);
     215                                }
     216                            }
     217                        } catch (IOException ioe) {
     218                            _log.error("GeoIP failure", ioe);
     219                        } catch (InvalidDatabaseException ide) {
     220                            _log.error("GeoIP failure", ide);
     221                        } finally {
     222                            if (ls != null) ls.close();
     223                        }
     224                    } else {
     225                        // Tor-style database
     226                        String[] countries = GeoIPv6.readGeoIPFile(_context, search, _codeCache);
     227                        for (int i = 0; i < countries.length; i++) {
     228                            if (countries[i] != null)
     229                                _IPToCountry.put(search[i], countries[i]);
     230                            else
     231                                _notFound.add(search[i]);
     232                        }
    167233                    }
    168234                }
     
    406472
    407473    /**
     474     * @return e.g. aabb:ccdd:eeff:1122::
     475     * @since 0.9.26 for maxmind
     476     */
     477    private static String toV6(long ip) {
     478        StringBuilder buf = new StringBuilder(21);
     479        for (int i = 0; i < 4; i++) {
     480            buf.append(Long.toHexString((ip >> ((3-i)*16)) & 0xffff));
     481            buf.append(':');
     482        }
     483        buf.append(':');
     484        return buf.toString();
     485    }
     486
     487    /**
    408488     * Get the country for a country code
    409489     * @param code two-letter lower case code
Note: See TracChangeset for help on using the changeset viewer.