diff --git a/build.xml b/build.xml index dd9d5bbf82..c68d8ac9c7 100644 --- a/build.xml +++ b/build.xml @@ -33,7 +33,7 @@ - + @@ -1054,10 +1054,6 @@ - @@ -1386,7 +1382,6 @@ - diff --git a/installer/resources/certificates/forum.i2p2.de.crt b/installer/resources/certificates/forum.i2p2.de.crt deleted file mode 100644 index e28b1cc59f..0000000000 --- a/installer/resources/certificates/forum.i2p2.de.crt +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFLDCCAxQCCQDLNmFBp0hvZzANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJV -SzEPMA0GA1UECBMGTG9uZG9uMQwwCgYDVQQKEwNJMlAxEjAQBgNVBAsTCVRoZSBG -b3J1bTEWMBQGA1UEAxMNZm9ydW0uaTJwMi5kZTAeFw0xMDEyMTkxNTAzNTJaFw0y -MDEyMTYxNTAzNTJaMFgxCzAJBgNVBAYTAlVLMQ8wDQYDVQQIEwZMb25kb24xDDAK -BgNVBAoTA0kyUDESMBAGA1UECxMJVGhlIEZvcnVtMRYwFAYDVQQDEw1mb3J1bS5p -MnAyLmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4y3yMKKnJZ6I -Q/f6e+e6LgsGGMWvpa8+EqQKMR4UH3n+8olwTdUqMx3XnyXhmeSYA8idpF+7Izdj -y/z/2UXZWJM5eEl3OER7Uv64CStr8Q1Xdq7Zg+4nomnWrCDv7pDVgwUlIplctFDk -uPijXdfgs8xHERR20DmgBGMIW9U+gkyCfcqis9OOcsV8xgFMqAqaGRyPnHW4WGR6 -93IVFavox8nWDy0KhY4TL3DDV1uEeaQqF9F97k1nQxSepH1yR23qB3Nta7E3OsHZ -7uwU/cBcNxGag1HsfXufPub0pay9jc8anXT3Ip5OFYpTaUjpYVRBq9m1VW+BUJiV -ir06wRiPLx5/rAVtsWquuyEn4Ou9kXnil3Lenq8IHfv3yEHq7EMQm7AgK8brSVRb -PyUXGOpgC/jfDydXDh4Dc0jJ2O6czk1U5BZcIxAHJ+x3t/vE4ks2tPLlJUoQ/lMt -3fn2u9jWY/eZMOe/V1lkEbGc4Vi6qrJoI6VIESwsgFmV7R9g4C1e3cAmbRMINV5r -0SAJ2pwzO+rSgVTnYd3Hq3GzvC1MmJd8tme3WVZVggLQbOaeLnzAKmX9ktfA4VUl -kGUIixnL0K96u5iAoH9bwwbirWRHnfmY1HnmQXidSmDj9clSrsrD64VYwv6ACy5b -wkb/XPtXzx/b9Pr6Co79141eqT9ArtECAwEAATANBgkqhkiG9w0BAQUFAAOCAgEA -1oaksgeb8eqVH17+lkIr1cs43jA1rMJ2ogYdLxodrwtGzniv7pGpv/MNMFQ6rN9a -dGwJKm1mo/uOpsPBIcSSScZA4ER7RWMXbuR+vIGpmjO6RMr0sjRLoc7VoK9NBP02 -AcudKm9/6dQ2X46oByUCqaTk0INQkWWOOX4M8GXqXFuEle1aZF6KC2wytxdzspyA -BpE+7xbV68DAdE3FbZuowjHcWlebaDp1JBFj1H1WwLGC0gyIwIevxPft6eW0Z5m2 -p3B4EDG6ZChurBjng9bcMBJNqRFWo0Zo2FfdyLkFRYOtGzhWUgjLJqkEJsLC3Gpx -83y2fXQ0qdxY6yNuwoZSXEX0vLQPJbVvB3Apcmjc2Q0xg+CkONP6S+D6eziRcqyh -LaRLWKNELUB7ikWj1IpDmAb/dZ/zaL51rqCqwN4glebAg2HWqzFm/MNT7YfTKI4+ -/QC7812Tcge8j+/368dmbfcQqOMB+nQha1YpNw5i+cUgKW4HJMwuoSGEaDQ9NLg6 -JH110OAwLL5tCwbgRlC+Cr1zTtwHkq1NRk3eIjAlz6HKsSos0IBxW8m0TLvrsHKE -/3B9w2hv+20k24ND1hiCYv4ShghpAeaaJEs0Rb1Km/jgH9jeHSRUBzpZYAhkKIzr -PlrC0DfYlSLTdTJ3MTx9gXyK8RqSh16M+tTvoQ0zEl8= ------END CERTIFICATE----- diff --git a/installer/resources/checklist.txt b/installer/resources/checklist.txt index e9e0fb688b..977ff9dc0e 100644 --- a/installer/resources/checklist.txt +++ b/installer/resources/checklist.txt @@ -10,7 +10,6 @@ Double-check trust list Change revision in: history.txt installer/install.xml - installer/resources/news.xml core/java/src/net/i2p/CoreVersion.java router/java/src/net/i2p/router/RouterVersion.java (change to BUILD = 0 and EXTRA = "") @@ -84,6 +83,7 @@ Website files to change: index_*.html hosts.txt if it changed (copy from i2p.i2p mtn branch) release-x.y.z.html (new) + static/news/news.xml Sync with mtn.i2p2.i2p Announce on: diff --git a/installer/resources/deletelist.txt b/installer/resources/deletelist.txt index 8a20e42dee..1d2c1d33cb 100644 --- a/installer/resources/deletelist.txt +++ b/installer/resources/deletelist.txt @@ -1,3 +1,5 @@ # Files listed here will be deleted after the update is extracted -# expired cert +# old reseed certs certificates/r31453.ovh.net +certificates/75.145.125.59.crt +certificates/forum.i2p2.de.crt diff --git a/installer/resources/news.xml b/installer/resources/news.xml deleted file mode 100644 index e91850b721..0000000000 --- a/installer/resources/news.xml +++ /dev/null @@ -1,26 +0,0 @@ - -
-

2012-10-27: 0.9.3 Released

- -

-0.9.3 includes extensive low-level changes to the queueing of messages in the router. -We implement the CoDel Active Queue Management (AQM) algoorithm. -We also unify the queueing and priority mechanisms in the transports to aid diagnosis and reduce network latency. -Work continues on fixing UDP transport bugs and making UDP more resistant to attacks. -There are more changes to improve the performance of the router and reduce its memory usage. -Also, we enable i2psnark's DHT support, introduced last release, by default. -As usual, there's also lots of bug fixes in this release, so updating is recommended. -

-Say hello to the volunteers on the #i2p-help IRC channel. -Get involved, -spread the word, -and donate! -If you find a bug, please enter a report on trac. -To help on translations, -volunteer on IRC #i2p-dev -or sign up on Transifex. -

-
diff --git a/installer/resources/news_fr.xml b/installer/resources/news_fr.xml deleted file mode 100644 index ab045e4bfa..0000000000 --- a/installer/resources/news_fr.xml +++ /dev/null @@ -1,21 +0,0 @@ - -
-

2011-03-02: La version 0.8.4 est sortie

-

-Cette version 0.8.4 contient quelques améliorations de performances et des corrections de bogues importantes. -i2psnark prend désormais en charge les liens magnet. -Comme d'habitude, la mise à jour est recommmandée. -

-Merci de participer à la croissance du réseau. -Venez nous encourager sur le canal IRC #i2p-help. -Impliquez-vous, -passez le mot, -et un petit don! -Si vous trouvez un bogue, merci d'entrer un rapport sur trac. -Nous cherchons toujours des volontaires pour travailler sur les traductions existantes et des nouvelles. -Merci de vous manifester sur l'IRC #i2p-dev. -

-