Changeset 5c0c69c


Ignore:
Timestamp:
Nov 20, 2018 2:25:49 PM (23 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
535f2da
Parents:
ef44c36
Message:

GeoIP: Add MaxMind? GeoLite2-Country database 2018113, gzipped
Database and Contents Copyright © 2018 MaxMind?, Inc.
This work is licensed under the Creative Commons Attribution-ShareAlike? 4.0 International License.
To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
This database incorporates GeoNames? http://www.geonames.org geographical data,
which is made available under the Creative Commons Attribution 3.0 License.
To view a copy of this license, visit http://www.creativecommons.org/licenses/by/3.0/us/.

  • Drop old ipv4 and ipv6 data files and build scripts
  • Build changes for new file
Files:
2 added
4 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    ref44c36 r5c0c69c  
    8888
    8989   json-simple 1.1.1
     90   (not included in most distribution packages)
    9091   See licenses/LICENSE-Apache2.0.txt
    9192
     
    160161GeoIP Data:
    161162   (not included in most distribution packages)
    162    GeoLite databases are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
    163    http://creativecommons.org/licenses/by-sa/3.0/
    164    This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/
     163   This product includes GeoLite2 data created by MaxMind, available from http://www.maxmind.com/
    165164   See licenses/LICENSE-GeoIP.txt
    166165
  • build.xml

    ref44c36 r5c0c69c  
    7777            <echo message=" " />
    7878            <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
    79             <echo message="  build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java \"  />
     79            <echo message="  build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java libjson-simple-java \"  />
    8080            <echo message="  devscripts libjetty9-java libtomcat8-java libtaglibs-standard-jstlel-java libgetopt-java"  />
    8181            <echo message=" " />
     
    16871687        <!-- decapitalized the file in 0.7.8 -->
    16881688        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    1689         <!-- small enough to include for now -->
    1690         <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    16911689        <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
    16921690      <!--
     
    17171715    <!-- As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
    17181716    <target name="prepgeoupdate-unlesspkg" unless="${with-geoip-database}" >
     1717        <mkdir dir="pkg-temp/geoip" />
     1718      <!--
    17191719        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    17201720        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
     1721       -->
     1722        <gunzip src="installer/resources/GeoLite2-Country.mmdb.gz" dest="pkg-temp/geoip/GeoLite2-Country.mmdb" />
    17211723    </target>
    17221724
     
    21142116    <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
    21152117    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, updater200WithJettyAndJbigi, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
     2118    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
     2119-->
    21162120    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    2117 -->
    2118     <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    21192121        <echo message="New version number is ${release.number}" />
    21202122        <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
     
    24682470            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    24692471            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2472            <file name="../i2p-${Extended.Version}/installer/resources/GeoLite2-Country.mmdb.gz" />
    24702473            <!-- libjetty9-java -->
    24712474            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
     
    25492552            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    25502553            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2554            <file name="../i2p-${Extended.Version}/installer/resources/GeoLite2-Country.mmdb.gz" />
    25512555            <!-- libjetty9-java -->
    25522556          <!--
     
    26322636            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    26332637            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2638            <file name="../i2p-${Extended.Version}/installer/resources/GeoLite2-Country.mmdb.gz" />
    26342639            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
    26352640            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
     
    27062711            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    27072712            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2713            <file name="../i2p-${Extended.Version}/installer/resources/GeoLite2-Country.mmdb.gz" />
    27082714            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
    27092715            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
  • history.txt

    ref44c36 r5c0c69c  
     12018-11-20 zzz
     2 * GeoIP: Add support for Maxmind GeoLite2 format (ticket #2268)
     3
     42018-11-19 zzz
     5 * Debian: Add libjson-simple-java dependency
     6 * Util: Change json lib from net.minidev.json to com.json.simple
     7
    182018-11-17 zzz
    29 * Console: Wizard fixes and improvements
     
    7142018-11-13 zzz
    815 * Console:
    9    - New M-Lab NDT subsystem
    10    - Setup wizard (WIP)
     16   - New M-Lab NDT subsystem (ticket #2321)
     17   - Setup wizard (WIP) (ticket #1473)
    1118 * Router: LS2 handling for proposal 123
    1219
  • installer/resources/checklist.md

    ref44c36 r5c0c69c  
    1111- Make announcement on Transifex with checkin deadline
    1212
    13 - GeoIP: Maxmind update is usually first week of the month, time accordingly
    14 - wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
    15 - unzip GeoIPCountryCSV.zip
    16 - cut -d, -f3-5 < GeoIPCountryWhois.csv|sed 's/"//g' > geoip.txt
    17 - replace header
    18 - fix date in header (get date from HEAD)
    19 - ./makegeoipv6.sh
    20 - mtn ci geoip.txt geoipv6.dat.gz
     13- GeoIP: Maxmind update is usually first Tuesday of the month, time accordingly
     14- installer/resources/makegeoip.sh
     15- mtn ci installer/resources/GeoLite2-Country.mmdb
    2116
    2217- BuildTime: Don't have to do this every release, but update the
  • licenses/LICENSE-GeoIP.txt

    ref44c36 r5c0c69c  
    1 The GeoLite databases are distributed under the
    2 Creative Commons Attribution-ShareAlike 3.0 Unported License
    3 http://creativecommons.org/licenses/by-sa/3.0/ .
     1Database and Contents Copyright (c) 2018 MaxMind, Inc.
     2This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
     3To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
     4No changes were made.
     5
     6This database incorporates GeoNames [http://www.geonames.org] geographical data,
     7which is made available under the Creative Commons Attribution 3.0 License.
     8To view a copy of this license, visit http://www.creativecommons.org/licenses/by/3.0/us/.
     9
    410The attribution requirement may be met by including the following in
    511all advertising and documentation mentioning features of or use of this database:
    612
    7 "This product includes GeoLite data created by MaxMind, available from
     13"This product includes GeoLite2 data created by MaxMind, available from
    814http://www.maxmind.com/"
  • router/java/src/net/i2p/router/RouterVersion.java

    ref44c36 r5c0c69c  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 5;
     21    public final static long BUILD = 6;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.