- tor-commits - lists.torproject.org

[flashproxy/master] Don't use a separate num_proxy_pairs variable.
by dcf＠torproject.org 18 Jul '11

18 Jul '11

commit b49755d365553fad2cf120a271e14bf276ac35bf Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 15 21:09:31 2011 +0000 Don't use a separate num_proxy_pairs variable. Just use the length of the proxy_pairs array. --- swfcat.as | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/swfcat.as b/swfcat.as index 9f0a4f7..c93c154 100644 --- a/swfcat.as +++ b/swfcat.as @@ -47,11 +47,7 @@ package /* UI shown when debug is off. */ private var badge:Badge; - /* Number of proxy pairs currently connected (up to - MAX_NUM_PROXY_PAIRS). */ - private var num_proxy_pairs:int = 0; - /* References to active proxy pairs, to prevent them from being - garbage collected. */ + /* Proxy pairs currently connected (up to MAX_NUM_PROXY_PAIRS). */ private var proxy_pairs:Array; private var fac_addr:Object; @@ -140,7 +136,7 @@ package var fac_url:String; var loader:URLLoader; - if (num_proxy_pairs >= MAX_NUM_PROXY_PAIRS) { + if (proxy_pairs.length >= MAX_NUM_PROXY_PAIRS) { setTimeout(proxy_main, FACILITATOR_POLL_INTERVAL); return; } @@ -197,14 +193,12 @@ package proxy_pairs.push(proxy_pair); proxy_pair.addEventListener(Event.COMPLETE, function(e:Event):void { proxy_pair.log("Complete."); - num_proxy_pairs--; /* Delete from the list of active proxy pairs. */ proxy_pairs.splice(proxy_pairs.indexOf(proxy_pair), 1); badge.proxy_end(); }); proxy_pair.connect(); - num_proxy_pairs++; badge.proxy_begin(); }

1 0

[flashproxy/master] Don't background the creation of the sparse file.
by dcf＠torproject.org 18 Jul '11

18 Jul '11

commit 7dd2e2fbaba165cc51b76099269d11bdaae8f2c5 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 15 21:15:38 2011 +0000 Don't background the creation of the sparse file. --- experiments/00 | 2 +- experiments/01 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experiments/00 b/experiments/00 index b88b974..484787d 100755 --- a/experiments/00 +++ b/experiments/00 @@ -13,7 +13,7 @@ cd .. # Create 1GB dump file echo "creating dump file..." rm dump -dd if=/dev/null of=dump bs=1G seek=1 & +dd if=/dev/null of=dump bs=1G seek=1 # Start http server echo "starting http server..." diff --git a/experiments/01 b/experiments/01 index 88e0565..b3962f9 100755 --- a/experiments/01 +++ b/experiments/01 @@ -13,7 +13,7 @@ cd .. # Create 1GB dump file echo "creating dump file..." rm dump -dd if=/dev/null of=dump bs=1G seek=1 & +dd if=/dev/null of=dump bs=1G seek=1 # Start http server echo "starting http server..."

1 0

[flashproxy/master] Changes to 00 to support multiple clients
by dcf＠torproject.org 17 Jul '11

17 Jul '11

commit 98a8dfaaf314e82f00b75dc0a33d3a4df3155862 Author: Jonathan <jdellithorpe(a)gmail.com> Date: Wed Jul 13 19:17:02 2011 -0700 Changes to 00 to support multiple clients --- experiments/00 | 58 ++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 20 deletions(-) diff --git a/experiments/00 b/experiments/00 index 973ee30..b88b974 100755 --- a/experiments/00 +++ b/experiments/00 @@ -1,5 +1,12 @@ #!/bin/bash +# Get arguments +if [ $1 ]; then + NUM_CLIENTS=$1 +else + NUM_CLIENTS=1 +fi + # Go to flashproxy repo root dir cd .. @@ -8,47 +15,58 @@ echo "creating dump file..." rm dump dd if=/dev/null of=dump bs=1G seek=1 & -sleep 1 - # Start http server echo "starting http server..." thttpd -p 1080 -sleep 1 - # Start crossdomain policy server echo "starting cross domain policy server..." sudo ./crossdomaind.py & -sleep 1 - # Start the facilitator echo "starting facilitator..." ./facilitator.py 4701 -r 127.0.0.1:1080 -sleep 1 - -# Start the flash proxy -echo "starting flash proxy..." -google-chrome --app=http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701 - -sleep 1 - -# Start socat adapter -echo "starting socat adapter..." -socat TCP-LISTEN:9000,reuseaddr,fork TCP-LISTEN:2000,reuseaddr & +# Start socat adapters +echo "starting socat adapters..." +i=1 +until [ $i -gt $NUM_CLIENTS ]; do + let local_port=2000+i + let remote_port=9000+i + socat TCP-LISTEN:${remote_port},reuseaddr,fork TCP-LISTEN:${local_port},reuseaddr & + let i=i+1 +done sleep 1 # Register with facilitator echo "registering with facilitator..." -echo $'POST / HTTP/1.0\r\n\r\nclient=127.0.0.1:9000' | ncat localhost 4701 --send-only +i=1 +until [ $i -gt $NUM_CLIENTS ]; do + let local_port=9000+i + echo $'POST / HTTP/1.0\r\n\r\nclient=127.0.0.1:'${local_port} | ncat localhost 4701 --send-only + let i=i+1 +done + +# Start the flash proxy, server side +echo "starting flash proxy server side..." +firefox --remote "openURL(http://localhost:1080/swfcat.swf?debug=1&facilitator=127.0.0.1:4701)" -sleep 10 +let query_fac_time=NUM_CLIENTS+2 +sleep ${query_fac_time} # wget the dump file echo "getting the dump file..." -wget http://localhost:2000/dump -O - > /dev/null +i=2 +until [ $i -gt $NUM_CLIENTS ]; do + let local_port=2000+i + gnome-terminal -e "/bin/bash -c 'wget http://localhost:${local_port}/dump -O - > /dev/null; exec /bin/bash -i'" + let i=i+1 + sleep 2 +done + +# Use this one for delaying the termination of experiment below +wget http://localhost:2001/dump -O - > /dev/null # Slaughter the processes ps -ef | sed -n '/thttpd/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {}

1 0

[flashproxy/master] Added remote switch and some sleep statements
by dcf＠torproject.org 17 Jul '11

17 Jul '11

commit 82ff35c7a0394e37c0fc030490c73afd9713b16d Author: Jonathan <jdellithorpe(a)gmail.com> Date: Wed Jul 13 18:43:17 2011 -0700 Added remote switch and some sleep statements --- experiments/01 | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/experiments/01 b/experiments/01 index 5b446b8..88e0565 100755 --- a/experiments/01 +++ b/experiments/01 @@ -42,14 +42,19 @@ echo "starting flash proxy client side..." i=1 until [ $i -gt $NUM_CLIENTS ]; do let local_port=9000+i - google-chrome --app="http://localhost:1080/swfcat.swf?local=127.0.0.1:${local_port}&client=1&fac…" + firefox --remote "openURL(http://localhost:1080/swfcat.swf?local=127.0.0.1:${local_port}&client=1&facilitator=127.0.0.1:4701)" let i=i+1 sleep 2 done +# Some connections take a long time to register with cirrus +sleep 15 + # Start the flash proxy, server side echo "starting flash proxy server side..." -google-chrome --app="http://localhost:1080/swfcat.swf?debug=1&facilitator=127.0.0.1:4701" +firefox --remote "openURL(http://localhost:1080/swfcat.swf?debug=1&facilitator=127.0.0.1:4701)" + +sleep 15 let query_fac_time=NUM_CLIENTS+2 sleep ${query_fac_time}

1 0

[flashproxy/master] Fix error handling for the "local" parameter.
by dcf＠torproject.org 17 Jul '11

17 Jul '11

commit 2958b2292d5517649087b1237af4e9bdd7eb65e7 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 17 11:23:49 2011 -0700 Fix error handling for the "local" parameter. get_param_addr already handles a default value. It signals a parsing error if the supplied value has a syntax error. --- swfcat.as | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/swfcat.as b/swfcat.as index 5be06fd..80916c8 100644 --- a/swfcat.as +++ b/swfcat.as @@ -106,10 +106,11 @@ package return; } - if (this.loaderInfo.parameters["local"]) - local_addr = get_param_addr("local", DEFAULT_LOCAL_TOR_CLIENT_ADDR); - else - local_addr = DEFAULT_LOCAL_TOR_CLIENT_ADDR; + local_addr = get_param_addr("local", DEFAULT_LOCAL_TOR_CLIENT_ADDR); + if (!local_addr) { + puts("Error: Local spec must be in the form \"host:port\"."); + return; + } if (this.loaderInfo.parameters["client"]) client_main();

1 0

[arm/master] Minor post-release cleanup
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e9a02ddc72a06d4290cb1f5b08de5da88c07a2dd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 17 00:45:00 2011 -0700 Minor post-release cleanup --- ChangeLog | 2 +- src/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b1b776..5692ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ CHANGE LOG -7/16/11 - version 1.4.3 +7/16/11 - version 1.4.3 (6cf4836) This completes the codebase refactoring project that's been a year in the works and provides numerous performance and usability improvements. Most notably this includes a setup wizard for new relays, menuing interface, gui prototype, substantial performance improvements, and support for Mac OSX. * added: relay setup wizard for autogenerating a torrc configuration diff --git a/src/version.py b/src/version.py index d135944..a1c26cf 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.3_dev' -LAST_MODIFIED = "April 4, 2011" +VERSION = '1.4.4_dev' +LAST_MODIFIED = "July 17, 2011"

1 0

[arm/packaging] Exporting dependencies from mirror
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 95d1ba0799ab05f3cd63c71edc89c49644cdeb83 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 17 00:42:42 2011 -0700 Exporting dependencies from mirror The cagraph wasn't being exported and torctl was coming from its source repo. Fetching both from the dependency mirror with sig checks instead. --- export.sh | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/export.sh b/export.sh index 79c6b38..ffa886a 100755 --- a/export.sh +++ b/export.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exports a copy of arm's release branch to the given location. This copy is -# stripped of git metadata and includes a bundled copy of TorCtl. This accepts -# an optional argument for where to place the export. +# stripped of git metadata and includes a bundled copy of TorCtl and cagraph. +# This accepts an optional argument for where to place the export. if [ $# -lt 1 ] then exportDst="./arm" @@ -19,15 +19,31 @@ fi mkdir $exportDst git archive --format=tar release | (cd $exportDst && tar xf -) +# fetches our torctl and cagraph dependency +wget --quiet http://www.atagar.com/arm/resources/deps/11-06-16/torctl.tar.gz +sha256sum torctl.tar.gz +echo "5460adb1394c368ba492cc33d6681618b3d3062b3f5f70b2a87520fc291701c3 <- expected" +tar -C $exportDst/src -xzf torctl.tar.gz +rm torctl.tar.gz + +wget --quiet http://www.atagar.com/arm/resources/deps/11-06-10/cagraph.tar.gz +sha256sum cagraph.tar.gz +echo "1439acd40ce016f4329deb216d86f36a749e4b8bf73a313a757396af6f95310d <- expected" +tar -C $exportDst/src -xzf cagraph.tar.gz +rm cagraph.tar.gz + +# the following installed torctl from its master repo rather than our +# dependency mirror + # fetches torctl to /tmp -torctlDir="$(mktemp -d)" -git clone git://git.torproject.org/pytorctl.git $torctlDir > /dev/null +#torctlDir="$(mktemp -d)" +#git clone git://git.torproject.org/pytorctl.git $torctlDir > /dev/null # exports torctl to the arm directory -(cd $torctlDir && git archive --format=tar --prefix=TorCtl/ master) | (cd $exportDst/src && tar xf - 2> /dev/null) +#(cd $torctlDir && git archive --format=tar --prefix=TorCtl/ master) | (cd $exportDst/src && tar xf - 2> /dev/null) # cleans up the temporary torctl repo -rm -rf torctlDir +#rm -rf torctlDir echo "arm exported to $exportDst"

1 0

[arm/release] Fix general panel stack trace reported by atagar.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 1c92159ab9114069f5e4093a2747597b9581c125 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 16 00:17:19 2011 +0500 Fix general panel stack trace reported by atagar. --- src/gui/generalPanel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gui/generalPanel.py b/src/gui/generalPanel.py index b16cac5..dee96be 100644 --- a/src/gui/generalPanel.py +++ b/src/gui/generalPanel.py @@ -62,7 +62,7 @@ class GeneralPanel(CliHeaderPanel): dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" - value = "%s%s%s" % (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel) + value = "%s%s%s%s" % (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel) else: if self._isTorConnected: value = "Disabled"

1 0

[arm/release] Catch conn.init() exception in case starter wants detached startup.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 7a863f9fdda39f0f9a0d2cd572a283ba38fa37bf Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 16 00:49:42 2011 +0500 Catch conn.init() exception in case starter wants detached startup. --- src/gui/graphing/bandwidthStats.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index 401302c..04dfda8 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -8,6 +8,7 @@ import gobject import gtk from TorCtl import TorCtl +from starter import CONFIG from gui.graphing import graphStats from util import uiTools, torTools @@ -17,7 +18,13 @@ class BandwidthStats(graphStats.GraphStats): conn = torTools.getConn() if not conn.isAlive(): - conn.init() + try: + conn.init() + except ValueError: + if CONFIG['features.allowDetachedStartup']: + return + else: + raise conn.setControllerEvents(["BW", "NEWDESC"]) conn.addEventListener(self)

1 0

[arm/release] Add GPL v3 text as license.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 3f3cc61e56a56bd9ca0fcd18a8f2c3763ec77903 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 16 00:53:27 2011 +0500 Add GPL v3 text as license. --- src/gui/arm.xml | 675 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 675 insertions(+), 0 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index edcc42a..56c9620 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -553,6 +553,681 @@ <property name="copyright" translatable="yes">Copyright (C) 2011 Kamran Riaz Khan</property> <property name="website">http://inspirated.com/</property> <property name="website_label" translatable="yes">Blog</property> + <property name="license" translatable="yes"> GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. +</property> <signal name="response" handler="on_aboutdialog_response"/> <child internal-child="vbox"> <object class="GtkVBox" id="aboutdialog_vbox">

1 0