Changeset b1beb46c


Ignore:
Timestamp:
Mar 9, 2008 2:45:31 PM (13 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d23c8a8
Parents:
5998f5c9 (diff), 6606c83 (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.i2p-0.6.1.33-pre' (head adbe93ae091c4ca78306ef94968a0c1d788e2c01)

to branch 'i2p.i2p' (head f541ec6c1ca7ffae49e31ee75559695d64152fa1)

Files:
9 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r5998f5c9 rb1beb46c  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<project basedir="." default="all" name="jetty">
    3        
     3
     4    <property name="jetty.sha1" value="021164f84da7304bd1ff07c268b45aa3e0b13322" />
     5    <property name="jetty.md5" value="a61adc832be6baf2678935506743cfc3" />
     6    <property name="jetty.url" value="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" />
     7    <property name="jetty.filename" value="jetty-5.1.12.zip" />
     8
    49    <target name="all" depends="build" />
    5     <target name="fetchJettylib" >
    6         <available property="jetty.zip.available" file="jetty-5.1.12.zip" type="file" />
     10
     11    <target name="ensureJettylib" >
     12        <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
    713        <available property="jetty.zip.extracted" file="jettylib" type="dir" />
    8         <ant target="doFetchJettylib" />
    9         <ant target="doExtractJettylib" />
     14        <ant target="fetchJettylib" />
     15        <ant target="verifyJettylib" />
     16        <ant target="extractJettylib" />
    1017    </target>
    11     <target name="doFetchJettylib" unless="jetty.zip.available" >
    12         <echo message="The libraries contained within the fetched file are from Jetty's 5.1.12" />
    13         <echo message="distribution (http://jetty.mortbay.org/).  These are not " />
    14         <echo message="necessary for using I2P, but are used by some applications on top of I2P," />
    15         <echo message="such as the routerconsole." />
    16         <get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" verbose="true" dest="jetty-5.1.12.zip" />
     18
     19    <target name="fetchJettylib" unless="jetty.zip.available" >
     20        <echo message="It seems that you don't have '${jetty.filename}' deployed." />
     21        <echo message="The build script can download this file for you automatically," />
     22        <echo message="or alternatively you can obtain it manually from:" />
     23        <echo message="${jetty.url}" />
     24        <echo message="" />
     25        <echo message="The libraries contained in the fetched file provide the Jetty web server" />
     26        <echo message="(http://jetty.mortbay.org/). They are not absolutely necessary" />
     27        <echo message="but strongly recommended, since they are used by some applications" />
     28        <echo message="on top of I2P, like the router console." />
     29        <echo message="" />
     30        <echo message="Even if you deploy the Jetty archive manually, the build script will" />
     31        <echo message="still attempt to verify its checksums, which must be:" />
     32        <echo message="SHA1 ${jetty.sha1}" />
     33        <echo message="MD5 ${jetty.md5}" />
     34        <echo message="" />
     35        <input message="Download Jetty archive automatically?" validargs="y,n" addproperty="jetty.download" />
     36        <fail message="Aborting as requested. Please deploy the Jetty archive manually." >
     37            <condition>
     38                <equals arg1="${jetty.download}" arg2="n"/>
     39            </condition>
     40        </fail>
     41        <get src="${jetty.url}" verbose="true" dest="${jetty.filename}" />
    1742    </target>
    18     <target name="doExtractJettylib" unless="jetty.zip.extracted" >
    19         <ant target="doExtract" />
     43
     44    <target name="verifyJettylib" >
     45        <condition property="jetty.zip.verified" >
     46            <and>
     47                <checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
     48                <checksum file="${jetty.filename}" algorithm="MD5" property="${jetty.md5}" />
     49            </and>
     50        </condition>
     51        <fail message="Jetty archive does not match its checksums!" >
     52            <condition>
     53                <not>
     54                    <istrue value="${jetty.zip.verified}" />
     55                </not>
     56            </condition>
     57        </fail>
    2058    </target>
    21     <target name="doExtract">
    22         <unzip src="jetty-5.1.12.zip" dest="." />
     59
     60    <target name="extractJettylib" unless="jetty.zip.extracted" >
     61        <unzip src="${jetty.filename}" dest="." />
    2362        <mkdir dir="jettylib" />
    2463        <copy todir="jettylib">
     
    3170                <include name="ant.jar" />
    3271                <include name="commons-el.jar" />
    33                 <include name="commons-logging.jar" />
     72                <include name="commons-logging.jar" />
    3473                <include name="jasper-compiler.jar" />
    3574                <include name="jasper-runtime.jar" />
     
    4180        <delete dir="jetty-5.1.12" />
    4281    </target>
    43     <target name="build" depends="fetchJettylib" />
     82
     83    <target name="build" depends="ensureJettylib" />
    4484    <target name="builddep" />
    4585    <target name="compile" />
  • build.xml

    r5998f5c9 rb1beb46c  
    4343    </target>
    4444    <target name="buildWEB">
    45         <ant dir="apps/jetty" target="fetchJettylib" />
     45        <ant dir="apps/jetty" target="ensureJettylib" />
    4646        <ant dir="apps/routerconsole/java" target="build" />
    4747        <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
  • checklist.txt

    r5998f5c9 rb1beb46c  
    55Start with a clean checkout mtn -d i2p.mtn co --branch=i2p.i2p
    66Double-check trust list
     7Deploy the Jetty archive, a clean checkout lacks it
    78
    89Change revision in:
     
    1718        ant dist
    1819        mtn ci
    19         mtn tag i2p-0.6.1.xx h:
     20        mtn tag h: i2p-0.6.1.xx
    2021        Sync with mtn.i2p2.i2p
    2122
     
    3435        mv i2p-0.6.1.xx.tar.bz2 i2p.i2p
    3536
    36 More signatures:
    37         sha1sum i2pinstall.exe i2p.tar.bz2 i2psource-0.6.1.xx.tar.bz2 i2pupdate.zip
    38         gpg -b i2pinstall.exe
    39         gpg -b i2p.tar.bz2
    40         gpg -b i2p-0.6.1.xx.tar.bz2
    41         gpg -b i2pupdate.zip
     37Until the build script gets this ability, you need to rename some files:
     38        mv i2pinstall.exe i2pinstall-0.6.1.xx.exe
     39        mv i2p.tar.bz2 i2pheadless-0.6.1.xx.tar.bz2
     40        mv i2pupdate.zip i2pupdate-0.6.1.xx.zip
     41        you probably don't need to rename i2pupdate.sud
     42
     43Generate hashes:
     44        sha1sum i2p*0.6.1.xx.*
     45        sha1sum i2pupdate.sud
     46        now GPG-sign an announcement with the hashes
     47
     48Generate PGP signatures:
     49        gpg -b i2pinstall-0.6.1.xx.exe
     50        gpg -b i2pheadless-0.6.1.xx.tar.bz2
     51        gpg -b i2psource-0.6.1.xx.tar.bz2
     52        gpg -b i2pupdate-0.6.1.xx.zip
     53        gpg -b i2pupdate.sud
    4254
    4355Distribute files to download locations and to www.i2p2.i2p
  • core/java/src/net/i2p/CoreVersion.java

    r5998f5c9 rb1beb46c  
    1616public class CoreVersion {
    1717    public final static String ID = "$Revision: 1.72 $ $Date: 2007-08-23 19:33:31 $";
    18     public final static String VERSION = "0.6.1.30";
     18    public final static String VERSION = "0.6.1.32";
    1919
    2020    public static void main(String args[]) {
  • history.txt

    r5998f5c9 rb1beb46c  
    1 2008-03-08 zzz
    2     * ClientPeerSelector: Implement strict ordering of peers,
    3       based on XOR distance from a random hash
    4       separately generated for each tunnel pool
     12008-03-09 Complication
     2    * Give the Jetty build file ability to ask permission
     3      before downloading the Jetty archive from the web,
     4      and to verify its SHA1 + MD5 hashes. Adjust the main build file
     5      in accordance with this change.
     6    * Improve the release checklist.
     7
     8* 2008-03-09  0.6.1.32 released
    59
    6102008-03-07 zzz
    7     * Naming: Optimize lookups for a destkey
    8     * ProfileOrganizer, TunnelPoolSettings, ClientPeerSelector:
    9       - Prevent peers with matching IPs from joining same tunnel.
    10         Match 0-4 bytes of IP (0=off, 1=most restrictive, 4=least).
    11         Default is 2 (disallow routers in same /16).
    12         Set with router.defaultPool.IPRestriction=x
    13       - Comment out unused RebuildPeriod pool setting
    14       - Add random key to pool in preparation for XOR peer ordering
    15     * SusiMail: Add 'Create Account' link
    16     * TunnelDispatcher: Change a common wtf error to a warn
    17 
    18 2008-03-05 zzz
    19     * Naming: Make HostsTxt the sole default NamingService
    20       (was Meta = PetName + HostsTxt)
    21     * Naming: Add two new experimental NamingServices, EepGet and Exec,
    22       not enabled by default -
    23       see source comments in core/java/src/net/i2p/client/naming
    24       for configuration instructions
    25     * i2psnark: Don't do a naming lookup for Base64 destkeys
    26     * i2psnark: Add a StartAll button
    27     * Stats: Add code to disable most stats to save memory.
    28       Set on configstats.jsp or set stat.full=false to disable the stats.
    29       (true by default for now)
     11    * Update news and version numbers
    3012
    31132008-03-01 zzz
  • initialNews.xml

    r5998f5c9 rb1beb46c  
    1 <i2p.news date="$Date: 2008-02-10 15:00:00 $">
    2  <i2p.release version="0.6.1.31" date="2008/02/10" minVersion="0.6"
     1<i2p.news date="$Date: 2008-03-09 15:00:00 $">
     2 <i2p.release version="0.6.1.32" date="2008/03/09" minVersion="0.6"
    33              anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
    44              publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
  • installer/install.xml

    r5998f5c9 rb1beb46c  
    55    <info>
    66        <appname>i2p</appname>
    7         <appversion>0.6.1.31</appversion>
     7        <appversion>0.6.1.32</appversion>
    88        <authors>
    99            <author name="I2P" email="http://forum.i2p.net"/>
  • news.xml

    r5998f5c9 rb1beb46c  
    1 <i2p.news date="$Date: 2008-02-10 15:00:00 $">
    2  <i2p.release version="0.6.1.31" date="2008/02/10" minVersion="0.6"
     1<i2p.news date="$Date: 2008-03-09 15:00:00 $">
     2 <i2p.release version="0.6.1.32" date="2008/03/09" minVersion="0.6"
    33              anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
    44              publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
     
    1010            anonlogs="http://i2p/Nf3ab-ZFkmI-LyMt7GjgT-jfvZ3zKDl0L96pmGQXF1B82W2Bfjf0n7~288vafocjFLnQnVcmZd~-p0-Oolfo9aW2Rm-AhyqxnxyLlPBqGxsJBXjPhm1JBT4Ia8FB-VXt0BuY0fMKdAfWwN61-tj4zIcQWRxv3DFquwEf035K~Ra4SWOqiuJgTRJu7~o~DzHVljVgWIzwf8Z84cz0X33pv-mdG~~y0Bsc2qJVnYwjjR178YMcRSmNE0FVMcs6f17c6zqhMw-11qjKpY~EJfHYCx4lBWF37CD0obbWqTNUIbL~78vxqZRT3dgAgnLixog9nqTO-0Rh~NpVUZnoUi7fNR~awW5U3Cf7rU7nNEKKobLue78hjvRcWn7upHUF45QqTDuaM3yZa7OsjbcH-I909DOub2Q0Dno6vIwuA7yrysccN1sbnkwZbKlf4T6~iDdhaSLJd97QCyPOlbyUfYy9QLNExlRqKgNVJcMJRrIual~Lb1CLbnzt0uvobM57UpqSAAAA/meeting141"
    1111            publiclogs="http://www.i2p.net/meeting141" />
     12<p>
     13&#149;
     142008-03-09: <b>0.6.1.32 Released</b>
     15</p><p>
     16The 0.6.1.32 release contains a new, more efficient
     17tunnel build algorithm, and fixes participating tunnel counts.
     18These changes should help network capacity, so please
     19upgrade when you get a chance.
     20This release also increases the default inbound bandwidth limit to 32KBps.
     21You may wish to adjust your limits on
     22<a href="config.jsp">config.jsp</a>.
     23</p>
     24
    1225<p>
    1326&#149;
     
    2639<p>
    2740&#149;
    28 2008-02-10: <b>0.6.1.31 released</b>
     412008-02-05: <b>Upgrading from 0.6.1.30 and Earlier Releases</b>
    2942</p><p>
    30 The transitional 0.6.1.31 release will make the I2P
    31 release process independent of jrandom and *.i2p.net servers,
    32 introducing two new update verification keys, adding support
    33 for distributed update hosting inside I2P, and changing many URLs.
    34 </p><p>
    35 It introduces version 2 of the SAM protocol,
    36 along with substantial improvements to the address book,
    37 I2PSnark and ircproxy. Unless you have already done that,
    38 read about the update procedure below.
    39 </p>
    40 
    41 <p>
    42 &#149;
    43 2008-02-05: <b>Upcoming 0.6.1.31 Release</b>
    44 </p><p>
    45 And, since i2p's lead developer
     43Since i2p's lead developer
    4644<a href="http://dreamtheaterfan.i2p/jrandom-awol.html">has gone AWOL</a>,
    4745we do not have his update signing key or write access to
     
    5250</p><p>
    5351Make the following configuration changes and your router will automatically install
    54 the upcoming 0.6.1.31 release when it becomes available.
    55 The release will include SAM v2, new jump server links, and addressbook, IRC proxy, and i2psnark improvements.
     52the latest release.
    5653</p><p>
    5754We recommend the automated process as it will verify the key of the signed update file.
    5855If you do not make these changes,
    59 you will still be able to manually download the new i2pupdate.zip file from locations to
    60 be announced.
     56you may manually download the i2pupdate.zip file from
     57<a href="http://www.i2p2.i2p/download.html">www.i2p2.i2p/download</a>.
    6158<ol><li>
    6259On
     
    8582</li></ol>
    8683<li>
    87 You are now ready to automatically receive the 0.6.1.31 update when it becomes available,
     84You are now ready to automatically receive the release update file,
    8885either by setting your update policy to "download and install" or by clicking on the
    8986"update available" link when it appears.
     
    9289If you would like to verify the trusted update keys, they are also
    9390<a href="http://stats.i2p/i2p/signingkeys.html">posted and signed here</a>.
    94 </p><p>
    95 The new release will be announced here, on
    96 <a href="http://forum.i2p/">the forums</a>, on IRC, and on Syndie.
    97 New users may install 0.6.1.31 from the
    98 <a href="http://www.i2p2.de/download">www.i2p2.de download page</a>.
    9991Thank you for your support during this transition. For help please contact us on #i2p.
    10092</p><p>
  • router/java/src/net/i2p/router/RouterVersion.java

    r5998f5c9 rb1beb46c  
    1717public class RouterVersion {
    1818    public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $";
    19     public final static String VERSION = "0.6.1.31";
    20     public final static long BUILD = 3204;
     19    public final static String VERSION = "0.6.1.32";
     20    public final static long BUILD = 1;
    2121    public static void main(String args[]) {
    2222        System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
Note: See TracChangeset for help on using the changeset viewer.