diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2008-07-03 21:43:45 +0000 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2008-07-03 21:43:45 +0000 |
| commit | 85fcf644b7106537953110cedb5cfe68ba2f6af1 (patch) | |
| tree | 0573f327aaf3a8a2501fbd36f743f29543b603c3 /net-p2p | |
| parent | media-tv/otrdecoder-bin: updated version, now use static (diff) | |
| download | sunrise-85fcf644b7106537953110cedb5cfe68ba2f6af1.tar.gz sunrise-85fcf644b7106537953110cedb5cfe68ba2f6af1.tar.bz2 sunrise-85fcf644b7106537953110cedb5cfe68ba2f6af1.zip | |
net-p2p/freenet: Update patch
svn path=/sunrise/; revision=6416
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/freenet/Manifest | 2 | ||||
| -rw-r--r-- | net-p2p/freenet/files/ext.patch | 39 |
2 files changed, 20 insertions, 21 deletions
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest index c17093255..8416b9412 100644 --- a/net-p2p/freenet/Manifest +++ b/net-p2p/freenet/Manifest @@ -1,4 +1,4 @@ -AUX ext.patch 5065 RMD160 168a521cea56770a9551ef6554d2df57248564e8 SHA1 f20a6ab88296ccac14539c2d9bf7eab4305d3b54 SHA256 5bc08f7f7a7e22e034117a1271390c0e6e2f3103c10fed1eb6551cfeb7d77585 +AUX ext.patch 4954 RMD160 57fb8ecf9be8900a1ad54306d5c4df1eef6acd80 SHA1 3f9eaacdac0165f22ab6fe368140b820b93191b2 SHA256 206205dcf18ae6ad641fcb9f620b605aea47ed6b078296b41476ac3074045325 AUX freenet 476 RMD160 feff89049a1107a5be2f99951634ab3192403420 SHA1 c71427613ca58e6336d2de19f4544dbf623712bb SHA256 19d3fcebd56a2578e330518d0dd41ba504102c993a23305d2f596520f6403de8 AUX freenet.old 452 RMD160 c07cd94a5f7ec882824b14a4f0e26cba05c1480c SHA1 beaf4d84a50ad3658160434d2de3379dafd81ec0 SHA256 af03d1479f8b42a5e7b7747486c40d76ebef99c5ed19fdcb185af03123f8c232 AUX wrapper.conf.patch 691 RMD160 a4f534fb81d20972d80d16a579a5f493918149d1 SHA1 e280d06f42e310cd96f207f5ffdb28ed18364425 SHA256 354dc64eab82bbc312ac226fab56932da7d7fc085bef2a8eb0092229f112ce1d diff --git a/net-p2p/freenet/files/ext.patch b/net-p2p/freenet/files/ext.patch index 702ff5345..0ab581ca6 100644 --- a/net-p2p/freenet/files/ext.patch +++ b/net-p2p/freenet/files/ext.patch @@ -74,20 +74,19 @@ diff -ur freenet-old/build.xml freenet/build.xml <pathelement location="${junit.location}"/> </classpath> -diff -ur freenet-old/src/freenet/node/NodeStarter.java freenet/src/freenet/node/NodeStarter.java ---- freenet-old/src/freenet/node/NodeStarter.java 2008-03-30 14:55:11.000000000 +0200 -+++ freenet/src/freenet/node/NodeStarter.java 2008-03-30 16:02:56.000000000 +0200 -@@ -167,37 +167,8 @@ - } +--- freenet/src/freenet/node/NodeStarter.java 2008-07-03 23:05:20.000000000 +0200 ++++ freenet/src/freenet/node/NodeStarter.java.new 2008-07-03 23:08:14.000000000 +0200 +@@ -162,37 +162,8 @@ + } - private void getExtBuild() { -- try{ -- extBuildNumber = ExtVersion.buildNumber; + private void getExtBuild() { +- try { +- extBuildNumber = ExtVersion.buildNumber; - extRevisionNumber = ExtVersion.cvsRevision; -- String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #"+extBuildNumber+" r"+extRevisionNumber; +- String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber + " r" + extRevisionNumber; - Logger.normal(this, builtWithMessage); - System.out.println(builtWithMessage); -- extBuildNumber = ExtVersion.buildNumber(); +- extBuildNumber = ExtVersion.buildNumber(); - if(extBuildNumber == -42) { - extBuildNumber = ExtVersion.extBuildNumber(); - extRevisionNumber = ExtVersion.extRevisionNumber(); @@ -104,16 +103,16 @@ diff -ur freenet-old/src/freenet/node/NodeStarter.java freenet/src/freenet/node/ - System.err.println(revisionMessage); - extRevisionNumber = "INVALID"; - } -- }catch(Throwable t){ -- // Compatibility code ... will be removed -- Logger.error(this, "Unable to get the version of your freenet-ext file : it's probably corrupted!"); -- System.err.println("Unable to get the version of your freenet-ext file : it's probably corrupted!"); -- System.err.println(t.getMessage()); -- extRevisionNumber = "INVALID"; -- extBuildNumber = -1; -- } -+ extRevisionNumber = ""; -+ extBuildNumber = RECOMMENDED_EXT_BUILD_NUMBER; +- } catch(Throwable t) { +- // Compatibility code ... will be removed +- Logger.error(this, "Unable to get the version of your freenet-ext file : it's probably corrupted!"); +- System.err.println("Unable to get the version of your freenet-ext file : it's probably corrupted!"); +- System.err.println(t.getMessage()); +- extRevisionNumber = "INVALID"; +- extBuildNumber = -1; +- } ++ extRevisionNumber = ""; ++ extBuildNumber = RECOMMENDED_EXT_BUILD_NUMBER; } /** |