Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Thomas Sachau (tommy)" <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-p2p/freenet/files: ext.patch freenet.old wrapper1.conf freenet
Date: Mon, 02 Feb 2009 21:26:01
Message-Id: E1LU6Io-0006wA-K5@stork.gentoo.org
1 tommy 09/02/02 21:25:58
2
3 Added: ext.patch freenet.old wrapper1.conf freenet
4 Log:
5 Initial commit. Fixes bug 128783
6 (Portage version: 2.2_rc23/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 net-p2p/freenet/files/ext.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/ext.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/ext.patch?rev=1.1&content-type=text/plain
13
14 Index: ext.patch
15 ===================================================================
16 diff -ur freenet-old/build.xml freenet/build.xml
17 --- freenet/build.xml 2009-02-01 15:23:22.000000000 +0100
18 +++ freenet/build.xml.new 2009-02-01 15:24:16.000000000 +0100
19 @@ -53,19 +53,9 @@
20 </exec>
21 </target>
22
23 - <target name="get-extjar" depends="env" unless="freenet-ext.present"
24 - description="Download some external libraries which Freenet relies on">
25 - <mkdir dir="${lib}"/>
26 - <get src="http://downloads.freenetproject.org/alpha/freenet-ext.jar"
27 - dest="${freenet-ext.location}"
28 - verbose="true"
29 - usetimestamp="true"/>
30 - <property name="freenet-ext.present" value="true"/>
31 - </target>
32 -
33 <!-- ================================================== -->
34
35 - <target name="compile" depends="get-extjar, generate-CSSTokenizerFilter">
36 + <target name="compile" depends="generate-CSSTokenizerFilter">
37 <!-- Create the time stamp -->
38 <tstamp/>
39
40 diff -ur freenet-old/src/freenet/node/NodeStarter.java freenet/src/freenet/node/NodeStarter.java
41 --- freenet-old/src/freenet/node/NodeStarter.java 2008-10-28 21:40:50.000000000 +0100
42 +++ freenet/src/freenet/node/NodeStarter.java 2008-10-28 21:39:14.000000000 +0100
43 @@ -162,37 +162,8 @@
44 }
45
46 private void getExtBuild() {
47 - try {
48 - extBuildNumber = ExtVersion.buildNumber;
49 - extRevisionNumber = ExtVersion.cvsRevision;
50 - String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber + " r" + extRevisionNumber;
51 - Logger.normal(this, builtWithMessage);
52 - System.out.println(builtWithMessage);
53 - extBuildNumber = ExtVersion.buildNumber();
54 - if(extBuildNumber == -42) {
55 - extBuildNumber = ExtVersion.extBuildNumber();
56 - extRevisionNumber = ExtVersion.extRevisionNumber();
57 - }
58 - if(extBuildNumber == 0) {
59 - String buildMessage = "extBuildNumber is 0; perhaps your freenet-ext.jar file is corrupted?";
60 - Logger.error(this, buildMessage);
61 - System.err.println(buildMessage);
62 - extBuildNumber = -1;
63 - }
64 - if(extRevisionNumber == null) {
65 - String revisionMessage = "extRevisionNumber is null; perhaps your freenet-ext.jar file is corrupted?";
66 - Logger.error(this, revisionMessage);
67 - System.err.println(revisionMessage);
68 - extRevisionNumber = "INVALID";
69 - }
70 - } catch(Throwable t) {
71 - // Compatibility code ... will be removed
72 - Logger.error(this, "Unable to get the version of your freenet-ext file : it's probably corrupted!");
73 - System.err.println("Unable to get the version of your freenet-ext file : it's probably corrupted!");
74 - System.err.println(t.getMessage());
75 - extRevisionNumber = "INVALID";
76 - extBuildNumber = -1;
77 - }
78 + extRevisionNumber = "";
79 + extBuildNumber = RECOMMENDED_EXT_BUILD_NUMBER;
80 }
81
82 /**
83
84
85
86 1.1 net-p2p/freenet/files/freenet.old
87
88 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/freenet.old?rev=1.1&view=markup
89 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/freenet.old?rev=1.1&content-type=text/plain
90
91 Index: freenet.old
92 ===================================================================
93 #!/sbin/runscript
94 # Copyright 1999-2004 Gentoo Foundation
95 # Distributed under the terms of the GNU General Public License v2
96
97 start() {
98 start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh start 2>/dev/null
99 eend 0
100 }
101
102 status() {
103 start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh status 2>/dev/null
104 eend 0
105 }
106
107 stop() {
108 start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh stop 2>/dev/null
109 eend 0
110 }
111
112
113
114 1.1 net-p2p/freenet/files/wrapper1.conf
115
116 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/wrapper1.conf?rev=1.1&view=markup
117 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/wrapper1.conf?rev=1.1&content-type=text/plain
118
119 Index: wrapper1.conf
120 ===================================================================
121 wrapper.java.command=java
122 wrapper.working.dir=/var/freenet/
123 wrapper.java.mainclass=freenet.node.NodeStarter
124 wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar
125 wrapper.java.classpath.2=/usr/share/java-service-wrapper/lib/wrapper.jar
126 wrapper.java.classpath.3=/usr/share/db-je-3.3/lib/je.jar
127 wrapper.java.classpath.4=/usr/share/fec/lib/fec.jar
128 wrapper.java.classpath.5=/usr/share/ant-core/lib/ant.jar
129 wrapper.java.classpath.6=/usr/share/lzma/lib/lzma.jar
130 wrapper.java.classpath.7=/usr/share/lzmajio/lib/lzmajio.jar
131 wrapper.java.classpath.8=/usr/share/mersennetwister/lib/mersennetwister.jar
132 wrapper.java.classpath.9=/usr/share/db4o-jdk5/lib/db4o-jdk5.jar
133 wrapper.java.classpath.10=/usr/share/db4o-jdk12/lib/db4o-jdk12.jar
134 wrapper.java.classpath.11=/usr/share/db4o-jdk11/lib/db4o-jdk11.jar
135 wrapper.java.library.path.1=/usr/lib
136 wrapper.java.initmemory=60
137 wrapper.java.maxmemory=128
138 wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
139 wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
140 wrapper.java.additional.3=-enableassertions:freenet
141 # You might want to set the following line if you have changed java.maxmemory
142 wrapper.java.additional.4=-XX:MaxPermSize=256M
143
144 wrapper.app.parameter.1=freenet.ini
145 wrapper.console.format=PM
146 wrapper.console.loglevel=INFO
147 wrapper.logfile=wrapper.log
148 wrapper.logfile.format=LPTM
149 wrapper.logfile.loglevel=INFO
150 wrapper.logfile.maxsize=2M
151 wrapper.logfile.maxfiles=3
152 wrapper.syslog.loglevel=NONE
153 wrapper.console.title=Freenet 0.7
154 wrapper.jvm_exit.timeout=120
155 wrapper.restart.reload_configuration=TRUE
156 wrapper.filter.trigger.1=java.lang.OutOfMemoryError
157 wrapper.filter.action.1=RESTART
158
159 # Name of the service
160 wrapper.ntservice.name=freenet-darknet
161
162 # Display name of the service
163 wrapper.ntservice.displayname=Freenet 0.7 darknet
164
165 # Description of the service
166 wrapper.ntservice.description=The Free Network Project daemon
167
168 # Service dependencies. Add dependencies as needed starting from 1
169 wrapper.ntservice.dependency.1=
170
171 # Mode in which the service is installed. AUTO_START or DEMAND_START
172 wrapper.ntservice.starttype=AUTO_START
173
174 # Allow the service to interact with the desktop.
175 wrapper.ntservice.interactive=false
176
177 wrapper.ntservice.process_priority=BELOW_NORMAL
178
179 # Start services with a different user than SYSTEM
180 # SEE http://wrapper.tanukisoftware.org/doc/english/prop-ntservice-account.html BEFORE PROCEEDING !
181
182
183
184 1.5 net-p2p/freenet/files/freenet
185
186 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/freenet?rev=1.5&view=markup
187 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/freenet?rev=1.5&content-type=text/plain
188 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/freenet?r1=1.4&r2=1.5
Report Message
Find on MARC Find on Google Groups