- tor-commits - lists.torproject.org

[torflow/master] fix regarding #3701
by mikeperry＠torproject.org 19 Aug '11

19 Aug '11

commit 37668610f78ac5b29ae399fac24ba70e2a2a643c Author: aagbsn <aagbsn(a)extc.org> Date: Mon Aug 15 13:42:14 2011 -0700 fix regarding #3701 https://trac.torproject.org/projects/tor/ticket/3701 bwauthority.py will no longer exit if the child dies with SIGTERM also modified run_scan.sh to kill -9 --- NetworkScanners/BwAuthority/bwauthority.py | 12 ++++++++++-- NetworkScanners/BwAuthority/run_scan.sh | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority.py b/NetworkScanners/BwAuthority/bwauthority.py index 9125044..3e626db 100755 --- a/NetworkScanners/BwAuthority/bwauthority.py +++ b/NetworkScanners/BwAuthority/bwauthority.py @@ -28,8 +28,16 @@ def main(argv): plog('WARN', 'Child process recieved SIGKILL, exiting') exit() elif (abs(p.returncode) == SIGTERM): - plog('WARN', 'Child process recieved SIGTERM, exiting') - exit() + #XXX + # see: https://trac.torproject.org/projects/tor/ticket/3701 + # if uncaught exceptions are raised in user-written handlers, TorCtl + # will kill the bwauthority_child process using os.kill() because sys.exit() + # only exits the thread in which the exception is caught. + # quote mikeperry: "we want this thing not do die. that is priority one" + # therefore: we restart the child process and hope for the best :-) + plog('WARN', 'Child process recieved SIGTERM') + #exit() + else: plog('WARN', 'Child process returned %s' % p.returncode) diff --git a/NetworkScanners/BwAuthority/run_scan.sh b/NetworkScanners/BwAuthority/run_scan.sh index 77a7a9a..b3e1355 100755 --- a/NetworkScanners/BwAuthority/run_scan.sh +++ b/NetworkScanners/BwAuthority/run_scan.sh @@ -12,7 +12,7 @@ for n in `seq $SCANNER_COUNT`; do PIDFILE=./data/scanner.${n}/bwauthority.pid if [ -f $PIDFILE ]; then echo "Killing off scanner $n." - kill `head -1 $PIDFILE` && rm $PIDFILE + kill -9 `head -1 $PIDFILE` && rm $PIDFILE fi done

1 0

[torouter/master] we want to fork the freedom-maker script for the torouter
by runa＠torproject.org 19 Aug '11

19 Aug '11

commit b1b7684e861effe1db69a9bcd253ccad21c49fb2 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Fri Aug 19 20:31:46 2011 +0100 we want to fork the freedom-maker script for the torouter --- freedom-maker/.gitignore | 1 + freedom-maker/COPYING | 674 +++++++++++++++++++++++++++++++++++++ freedom-maker/Makefile | 17 + freedom-maker/README | 38 ++ freedom-maker/TODO | 13 + freedom-maker/bin/copy2dream.sh | 30 ++ freedom-maker/fbx-armel.conf | 3 + freedom-maker/fbx-base.conf | 13 + freedom-maker/flashing-notes | 28 ++ freedom-maker/mk_dreamplug_rootfs | 179 ++++++++++ 10 files changed, 996 insertions(+), 0 deletions(-) diff --git a/freedom-maker/.gitignore b/freedom-maker/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/freedom-maker/.gitignore @@ -0,0 +1 @@ +build diff --git a/freedom-maker/COPYING b/freedom-maker/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/freedom-maker/COPYING @@ -0,0 +1,674 @@ + 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>. diff --git a/freedom-maker/Makefile b/freedom-maker/Makefile new file mode 100644 index 0000000..e8fc80a --- /dev/null +++ b/freedom-maker/Makefile @@ -0,0 +1,17 @@ +# copy DreamPlug root filesystem to a usb stick with an ext3 partition +dreamstick: stamp-dreamplug-rootfs + mount /media/freedom + sudo rsync -atvz --progress --delete build/dreamplug/ /media/freedom/ + umount /media/freedom + +# populate a tree with DreamPlug root filesystem +stamp-dreamplug-rootfs: fbx-armel.conf fbx-base.conf mk_dreamplug_rootfs + sudo ./mk_dreamplug_rootfs + touch stamp-dreamplug-rootfs + +clean: + rm -f stamp-dreamplug-rootfs + sudo rm -rf build/dreamplug + +distclean: clean + rm -rf build diff --git a/freedom-maker/README b/freedom-maker/README new file mode 100644 index 0000000..215f56e --- /dev/null +++ b/freedom-maker/README @@ -0,0 +1,38 @@ +Freedom-Maker - Bdale's building tools for the FreedomBox project + +Install required build packages: + apt-get install multistrap qemu-user-static + +To build for a DreamPlug, use + + sudo ./mk_dreamplug_rootfs + +This will yield a file tree under build/dreamplug, representing the +contents of a root file system. Get that onto a USB stick with something +like + + sudo mount /dev/sdc1 /media/freedom + sudo rsync -atvz --progress build/dreamplug/ /media/freedom/ + sudo umount /media/freedom + +Move the USB stick to the DreamPlug, and arrange to boot the existing kernel +from internal microSD pointing to our new root filesystem by interrupting the +boot to talk to U-Boot: + + setenv x_bootargs_root root=/dev/sdc1 rootdelay=10 + saveenv + reset + +The system should boot to a login prompt. + +- - - - - + +If you want to set things up to boot from the internal microSD card, once +you're logged into the system booted from root on USB stick you can use: + + sh /boot/copy2dream.sh + +- - - - - + +Be aware that this is an imcomplete solution for now .. you will want to at +least do things like create unique ssh host keys for your device! diff --git a/freedom-maker/TODO b/freedom-maker/TODO new file mode 100644 index 0000000..32c138d --- /dev/null +++ b/freedom-maker/TODO @@ -0,0 +1,13 @@ +- re-factor the script(s) to allow building for at least Sheeva and Dream +- fold in use of vmdebootstrap to build x86 image(s) +- there are a few things we really do want to defer to first boot, or at least + make it trivial to fix up per-system + - ssh host keys + - root password +- decide what we're going to do about the provided u-boot .. use or replace? +- decide which kernel we actually want to run and incorporate into the build +- work out recommended process for getting from freedom-maker outputs to bits + installed and running on each target type + - DreamPlug: sh /boot/copy2dream.sh +- add Sheeva as a build target +- add x86 virtualized as a build target (use vmdebootstrap?) diff --git a/freedom-maker/bin/copy2dream.sh b/freedom-maker/bin/copy2dream.sh new file mode 100644 index 0000000..cc800e9 --- /dev/null +++ b/freedom-maker/bin/copy2dream.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# +# this script assumes the current root filesystem is the source, and the +# internal microSD on a DreamPlug is the target .. copy the kernel uImage to +# the FAT partition on sda1, and the root contents to the ext3 on sda2 +# +mount /dev/sda1 /media +mv /media/uImage /media/uImage.old +cp /boot/uImage /media/uImage +umount /media + +mke2fs -j /dev/sda2 +mount /dev/sda2 /media +(cd / ; tar cf - `/bin/ls | grep -v proc | grep -v sys | grep -v media | grep -v dev`) | \ + (cd /media ; tar xvf -) + +mkdir /media/proc /media/sys /media/media + +echo "Creating basic device nodes" +mkdir /media/dev +mknod /media/dev/console c 5 1 +mknod /media/dev/random c 1 8 +mknod /media/dev/urandom c 1 9 +mknod /media/dev/null c 1 3 +mknod /media/dev/ptmx c 5 2 + +umount /dev/sda2 + +echo "interrupt the next boot and change the root path to /dev/sda2" + diff --git a/freedom-maker/fbx-armel.conf b/freedom-maker/fbx-armel.conf new file mode 100644 index 0000000..a6a7d6c --- /dev/null +++ b/freedom-maker/fbx-armel.conf @@ -0,0 +1,3 @@ +[General] +arch=armel +include=fbx-base.conf diff --git a/freedom-maker/fbx-base.conf b/freedom-maker/fbx-base.conf new file mode 100644 index 0000000..0096f1a --- /dev/null +++ b/freedom-maker/fbx-base.conf @@ -0,0 +1,13 @@ +[General] +cleanup=false +noauth=false +unpack=true +aptsources=Debian +debootstrap=Debian + +[Debian] +packages=base-files netbase openssh-server zile wget iproute net-tools hostname module-init-tools wget resolvconf udev isc-dhcp-client ifupdown rsyslog libertas-firmware +source=http://ftp.ba.debian.org/debian +keyring=debian-archive-keyring +suite=squeeze +components=main contrib non-free diff --git a/freedom-maker/flashing-notes b/freedom-maker/flashing-notes new file mode 100644 index 0000000..def3f61 --- /dev/null +++ b/freedom-maker/flashing-notes @@ -0,0 +1,28 @@ +Jason <u-boot(a)lakedaemon.net> says: + + Sort of. The openocd config for the sheevaplug/guruplug is what I use, + and is distributed on the dreamplug download page [1]. It does _not_ + have support for the SPI flash. You can also use the sheevaplug.cfg + shipped with openocd. So, I use openocd or tftp to transfer to RAM, + then use u-boot to write to flash. + + To test images, or to reflash, I load the known-good u-boot into RAM via + openocd, then I'll either reflash it or load a new testing one from + there. + + To write a u-boot.kwb test image to flash, here is what I do: + + openocd$ sheevaplug_init + openocd$ load_image u-boot # known good from Marvell + openocd$ load_image u-boot.kwb 0x00800000 # monster I created + openocd$ resume 0x00600000 # run the known good + + then, in u-boot + + u-boot$ sf probe 0 + u-boot$ sf erase 0x0 0x100000 + u-boot$ sf write 0x00800000 0x0 0x100000 + + If time allows, I'd like to add SPI flash support to OpenOCD. + Unfortunately, time is short and the above process works. + diff --git a/freedom-maker/mk_dreamplug_rootfs b/freedom-maker/mk_dreamplug_rootfs new file mode 100755 index 0000000..a70f032 --- /dev/null +++ b/freedom-maker/mk_dreamplug_rootfs @@ -0,0 +1,179 @@ +#!/bin/bash +# +# Copyright 2011 by Bdale Garbee <bdale(a)gag.com> +# +# 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/>. +# + +# based on work by <ivan(a)sanchezortega.es>, who released his script under +# the following license terms: +# ---------------------------------------------------------------------------- +# "THE BEER-WARE LICENSE" (Revision 42): +# As long as you retain this notice you can do whatever you want with +# this stuff. If we meet some day, and you think this stuff is worth it, +# you can buy me a beer in return. +# ---------------------------------------------------------------------------- + +# mk_dreamplug_rootfs +# +# Runs multistrap and readies the resulting root filesystem to silently +# complete package configuration on the first boot-up. + +# where to build images, etc +basedir=`pwd`/build +target=$basedir/dreamplug +tmpdir=$basedir/tmp +pkgcache=$tmpdir/aptcache + +mkdir -p $target +mkdir -p $tmpdir +mkdir -p $pkgcache + +hostname='freedombox' +rootpassword='freedom' + +kernelimage=http://www.newit.co.uk/kernels/Dreamplug/Dreamplug-prerelease/uImage +kernelmodules=http://www.newit.co.uk/kernels/Dreamplug/Dreamplug-prerelease/Modules.tar.gz + +if [ ! -f $tmpdir/uImage ] +then + wget -c $kernelimage --output-document="$tmpdir/uImage" +fi +if [ ! -f $tmpdir/linux.tar.gz ] +then + wget -c $kernelmodules --output-document="$tmpdir/linux.tar.gz" +fi + +rm -rf $target/* + +mkdir -p $target/var/cache/apt/ && mount -o bind $pkgcache $target/var/cache/apt/ + +echo "Multistrapping..." +multistrap -f fbx-armel.conf --no-auth -d $target + +umount $target/var/cache/apt/ +mkdir $target/var/cache/apt/archives + +echo "Unpacking kernel modules..." +mkdir -p $target/lib/modules/ +tar -C $target/lib/ -zxvf $tmpdir/linux.tar.gz | tail + +echo "copy uImage to target filesystem" +mkdir -p $target/boot +cp build/tmp/uImage $target/boot/uImage +echo "copy copy2dream.sh script to target filesystem" +cp bin/copy2dream.sh $target/boot/copy2dream.sh + +# Until udev is configured and run for the first time, dev nodes won't be created, but we need some basic ones for spawning a console (console) and creating RSA keys for SSH (urandom). +echo "Creating basic device nodes" +mknod $target/dev/console c 5 1 +mknod $target/dev/random c 1 8 +mknod $target/dev/urandom c 1 9 +mknod $target/dev/null c 1 3 +mknod $target/dev/ptmx c 5 2 + +# Basic fstab & mtab.. +echo "Setting up basic fstab & mtab" +echo " +rootfs / rootfs relatime,rw 0 0 +proc /proc proc none 0 0 +sys /sys sysfs none 0 0 +none /dev/pts devpts defaults 0 0 +tmpfs /tmp tmpfs rw,nosuid,nodev 0 0 +" > $target/etc/fstab + +touch $target/etc/mtab + +# Set up hostname +echo "Setting up hostname, /etc/network/interfaces, nameservers, persistent-net-generator rules" +echo $hostname > $target/etc/hostname + +# Create /etc/network/interfaces +echo "# This file describes the network interfaces available on your system +# and how to activate them. For more information, see interfaces(5). + +# The loopback network interface +auto lo +iface lo inet loopback + +# The primary network interface +allow-hotplug eth0 +iface eth0 inet dhcp + +allow-hotplug eth1 +iface eth1 inet dhcp + " > $target/etc/network/interfaces + +# Setup nameserver (use OpenDNS by default) +echo "nameserver 208.67.222.222 +nameserver 208.67.220.220" > $target/etc/resolv.conf + +# Touch the net generator udev so that eth0 won't be reassigned in case the user +# changes the MAC address - this may happen if you change the rootfs between plugs. +touch $target/etc/udev/rules.d/75-persistent-net-generator.rules + +# generate configuration script + +echo "Create script to configure packages in qemu-user-static" + +echo " +echo \"Preconfiguring dash - else dash and bash will be left in a broken state\" +/var/lib/dpkg/info/dash.preinst install + +echo \"Configuring all packages\" +export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true +export LC_ALL=C LANGUAGE=C LANG=C +dpkg --configure -a + +# Establish an initial root password +echo \"Set root password to \"$rootpassword +echo root:$rootpassword | /usr/sbin/chpasswd + +# By default, spawn a console on the serial port +echo \"Adding a getty on the serial port\" +echo \"T0:12345:respawn:/sbin/getty -L ttyS0 115200 vt100\" >> /etc/inittab + +echo \"Tweaks to reduce flash writes as per http://www.plugcomputer.org/plugwiki/index.php/Reduce_Flash_Writes\" +echo \" +# Reduce writes to flash drives +vm.laptop_mode=5 +vm.swappiness=0 +vm.dirty_writeback_centisecs=1500 +vm.dirty_expire_centisecs=1500 +\" >> /etc/sysctl.conf + +echo \"Deleting this very same script\" +rm -f /install.sh + +echo \"Syncing filesystem just in case something didn't get written\" +sync + +echo \"End configuration progress by exiting from the chroot\" +exit + +" > $target/install.sh + +chmod 755 $target/install.sh + +echo "Use qemu-user-static to perform first-boot configuration now" + +mkdir -p $target/usr/bin +cp /usr/bin/qemu-arm-static $target/usr/bin +chroot $target /install.sh +rm $target/usr/bin/qemu-arm-static + +echo "Syncing..." +sync + +echo "Finished. You may now copy the rootfs to the plug."

1 0

[torbrowser/master] downgrade to vidalia 0.2.12, 0.2.13 isn't ready for stable bundles
by erinn＠torproject.org 19 Aug '11

19 Aug '11

commit bf2032f077487acfbdfbe673b4d9f970bc9a034f Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 20:30:19 2011 +0200 downgrade to vidalia 0.2.12, 0.2.13 isn't ready for stable bundles --- README.Linux | 3 +-- README.OSX | 3 +-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.Linux b/README.Linux index 9dbee53..60b8bce 100644 --- a/README.Linux +++ b/README.Linux @@ -4,7 +4,7 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.13 (with Qt 4.6.2) +Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-0.9.8p) Firefox 3.6.20 \_ Torbutton 1.2.5 @@ -30,7 +30,6 @@ Changelog 1.1.13: Released 2011-08-19 Update Tor to 0.2.2.31-rc - Update Vidalia to 0.2.13 Update Firefox to 3.6.20 Update Libevent to 2.0.13-stable Update NoScript to 2.1.2.6 diff --git a/README.OSX b/README.OSX index cea0edf..a5c6673 100644 --- a/README.OSX +++ b/README.OSX @@ -4,7 +4,7 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.13 (with Qt 4.6.2) +Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-0.9.8p) Polipo 1.0.4.1 Firefox 3.6.20 @@ -25,7 +25,6 @@ Changelog 1.0.23: Released 2011-08-19 Update Tor to 0.2.2.31-rc - Update Vidalia to 0.2.13 Update Firefox to 3.6.20 Update Libevent to 2.0.13-stable Update NoScript to 2.1.2.6 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index e007388..d725dd0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -53,7 +53,7 @@ POLIPO_VER=1.0.4.1 QT_VER=4.6.2 TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.13 +VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5 ## Extension IDs diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bbcddb5..f4a25e1 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -53,7 +53,7 @@ POLIPO_VER=1.0.4.1 QT_VER=4.6.2 TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.13 +VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5 ## Extension IDs

1 0

[torbrowser/master] stop calling the install-betteprivacy target in makefiles too
by erinn＠torproject.org 19 Aug '11

19 Aug '11

commit 57bd70de17606df28526ad9524f22f64849f66af Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 20:31:12 2011 +0200 stop calling the install-betteprivacy target in makefiles too --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d725dd0..deba909 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -449,7 +449,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-betterprivacy install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref + make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index f4a25e1..d101ec1 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -443,7 +443,7 @@ bundle_%: compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f osx.mk copy-files_$* install-extensions install-betterprivacy install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final + make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp

1 0

[torouter/master] Fix mistypo
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 338d496dfeeacbe4d8b277f2c5866ffa51612e40 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 17:43:31 2011 +0200 Fix mistypo --- packages/torouter-web/src/tui/utils/parsing.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py index d6aaf2b..b4dbaee 100644 --- a/packages/torouter-web/src/tui/utils/parsing.py +++ b/packages/torouter-web/src/tui/utils/parsing.py @@ -79,7 +79,7 @@ class interfaces: return output def output(self, data): - output = "iface %s" % data['iface'] + output = "iface %s\n" % data['iface'] for item in data.items(): if item[0] != "iface": if type(item[1]) is list: @@ -94,7 +94,7 @@ class interfaces: for entry in self.wifi['post-up']: if re.search("sys_cfg_ssid", entry): print essid - self.wifi['post-up'][i] = 'post-up /usr/bin/uaputl sys_cfg_ssid "' + essid + '"' + self.wifi['post-up'][i] = '/usr/bin/uaputl sys_cfg_ssid "' + essid + '"' i += 1 # XXX currently works for one pre-up entry, must make it work also for arrays

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit b67bbdcbf32737a30da937b9e995195fddf75903 Merge: 338d496 18ce925 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 17:43:50 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/src/torouter_config.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[torouter/master] add other marvel package
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit f76a57a4534722c7facb0432b4ee49e0030c7d1a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 17:15:15 2011 +0200 add other marvel package --- packages/torouter-prep/src/torouter_config.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 12f7ab3..deaa72b 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -43,6 +43,7 @@ apt-get -y remove exim4-base exim4-config exim4-daemon-light dbus # Install the weird wireless control for the DreamPlug apt-get install -y -t sid uaputl +apt-get install -y -t sid uapevent # Install some other packages here: apt-get -y install denyhosts ufw

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 18ce925004eb3030b91c01beda43a58017607103 Merge: f76a57a fe239d1 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 17:25:35 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/src/tui/config.py | 5 +- .../torouter-web/src/tui/controllers/network.py | 12 +++++- packages/torouter-web/src/tui/controllers/tor.py | 13 ++++-- .../torouter-web/src/tui/utils/configuration.py | 41 +++++++++++++++----- packages/torouter-web/src/tui/utils/fileio.py | 8 ++-- packages/torouter-web/src/tui/utils/parsing.py | 38 ++++++++++++++++-- 6 files changed, 90 insertions(+), 27 deletions(-)

1 0

[torouter/master] Use correct tmp filenames and paths
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit fe239d1d9e8a590798abc31cd7bf7cf11324cfd5 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 17:33:58 2011 +0200 Use correct tmp filenames and paths --- packages/torouter-web/src/tui/config.py | 5 +++-- packages/torouter-web/src/tui/utils/fileio.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/torouter-web/src/tui/config.py b/packages/torouter-web/src/tui/config.py index f3f8dcc..73087f2 100644 --- a/packages/torouter-web/src/tui/config.py +++ b/packages/torouter-web/src/tui/config.py @@ -11,7 +11,8 @@ globals = {} # Add your own (username, password) pair authinfo = ("test", "test") -interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces" +#interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces" #torrc_file = os.getcwd() + "/../../torouter-prep/configs/torrc" -torrc_file = "/tmp/torrc" +torrc_file = "/var/tmp/tor-tui/torrc" +interfaces_file = "/var/tmp/tor-tui/interfaces" diff --git a/packages/torouter-web/src/tui/utils/fileio.py b/packages/torouter-web/src/tui/utils/fileio.py index 5b88504..c6574b7 100644 --- a/packages/torouter-web/src/tui/utils/fileio.py +++ b/packages/torouter-web/src/tui/utils/fileio.py @@ -1,12 +1,12 @@ import os def write(files): - tmp_dir = "/var/tmp/tor-tui" + tmp_dir = "/var/tmp/tor-tui/" tmpfiles = [] for file in files: if not os.path.exists(tmp_dir): os.mkdir(tmp_dir) - tmpfile = tmp_dir + file[0].split("/")[-1:][0] + ".tmp" + tmpfile = tmp_dir + file[0].split("/")[-1:][0] tmpfiles.append((tmpfile,file[0])) # open the tmp file for write f = open(tmpfile, 'w')

1 0

[torouter/master] Allow writing to network/interfaces file for wireless network settings
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 0fb54f161f5344f5a7e764801e202337b6d0e451 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 17:27:01 2011 +0200 Allow writing to network/interfaces file for wireless network settings --- .../torouter-web/src/tui/controllers/network.py | 12 +++++- .../torouter-web/src/tui/utils/configuration.py | 41 +++++++++++++++----- packages/torouter-web/src/tui/utils/fileio.py | 4 +- packages/torouter-web/src/tui/utils/parsing.py | 38 ++++++++++++++++-- 4 files changed, 77 insertions(+), 18 deletions(-) diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py index bf48f54..690dc3f 100644 --- a/packages/torouter-web/src/tui/controllers/network.py +++ b/packages/torouter-web/src/tui/controllers/network.py @@ -2,7 +2,7 @@ import web from tui import config from tui import view from tui.view import render -from tui.utils import session,configuration,parsing +from tui.utils import session, configuration, parsing, fileio """ This function is used to generate the network @@ -75,6 +75,16 @@ Wireless network configuration page class wireless: # XXX do all the backend stuff def update_config(self, data): + itfc = parsing.interfaces(config.interfaces_file) + itfc.parse() + itfc.set_ssid(data.essid) + itfc.set_mac(data.mac) + itfc.wifi['netmask'] = data.netmask + itfc.wifi['address'] = data.address + filecontent = itfc.exclude_output("uap0") + itfc.output(itfc.wifi) + files = [('/etc/network/interfaces', filecontent)] + fileio.write(files) + #print itfc.output(itfc.wifi) return True def GET(self): diff --git a/packages/torouter-web/src/tui/utils/configuration.py b/packages/torouter-web/src/tui/utils/configuration.py index 7133443..336aa54 100644 --- a/packages/torouter-web/src/tui/utils/configuration.py +++ b/packages/torouter-web/src/tui/utils/configuration.py @@ -1,15 +1,32 @@ import web +import re +from tui.utils import parsing from tui import config def get(name): conf = {} - # XXX The content of these functions are just - # skeletons + itfc = parsing.interfaces(config.interfaces_file) + itfc.parse() + if name == "wireless": - conf['essid'] = "Torouter" - conf['encryption'] = "WPA2" - conf['mac'] = "00:66:66:66:66:66" - conf['key'] = "ljdasjkbcuBH12389Ba" + conf['essid'] = "tor" + conf['mac'] = "00:11:22:33:44:55" + for entry in itfc.wifi['post-up']: + if re.search("sys_cfg_ssid", entry): + conf['essid'] = entry.split(" ")[2].split("\"")[1] + + if type(itfc.wifi['pre-up']) is str: + conf['mac'] = itfc.wifi['pre-up'].split(" ")[4] + else: + for entry in itfc.wifi['pre-up']: + if re.search("ether", entry): + print "hahah" + conf['mac'] = entry.split(" ")[4] + + conf['netmask'] = itfc.wifi['netmask'] + conf['address'] = itfc.wifi['address'] + conf['encryption'] = "open" + conf['key'] = "" return conf elif name == "firewall": conf['el1'] = "Element 1" @@ -43,13 +60,17 @@ def get_form(name): c = get(name) return web.form.Form( web.form.Textbox(name='essid', - description='Wireless ESSID', value=c['essid']), + description='ESSID', value=c['essid']), web.form.Textbox(name='mac', - description='Wireless MAC address', value=c['mac']), + description='MAC address', value=c['mac']), + web.form.Textbox(name='address', + description='IP address', value=c['address']), + web.form.Textbox(name='netmask', + description='Netmask address', value=c['netmask']), web.form.Dropdown(name='enctype', args=['WPA2', 'WPA', 'WEP (not reccomended)', 'open'], - description='Wireless encryption scheme', value=c['encryption']), + description='Encryption scheme', value=c['encryption']), web.form.Password(name='key', - description='key', value=c['key']), + description='Key', value=c['key']), web.form.Button('save') ) elif name == "firewall": diff --git a/packages/torouter-web/src/tui/utils/fileio.py b/packages/torouter-web/src/tui/utils/fileio.py index 0675f3f..5b88504 100644 --- a/packages/torouter-web/src/tui/utils/fileio.py +++ b/packages/torouter-web/src/tui/utils/fileio.py @@ -15,8 +15,8 @@ def write(files): f.close() # rename all the file. This operation is atomic - for file in tmpfiles: - os.rename(file[0], file[1]) + #for file in tmpfiles: + # os.rename(file[0], file[1]) # for testing #files = [('/tmp/file1','blablbal'),('/tmp/file2','The content'),('/tmp/file3','The content 3')] diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py index daf4436..d6aaf2b 100644 --- a/packages/torouter-web/src/tui/utils/parsing.py +++ b/packages/torouter-web/src/tui/utils/parsing.py @@ -1,15 +1,29 @@ # These functions are for parsing /etc/network/interface # files, they will be used inside torouter to visualize # and edit configuration -import os +import os, re class interfaces: def __init__(self,filename): + self.filename = filename self.fp = open(filename, "r") self.wifi = {} self.eth1 = {} self.eth0 = {} - + + def exclude_output(self, iexclude): + iface = None + output = "" + self.fp = open(self.filename, "r") + for line in self.fp.readlines(): + if line.lstrip().startswith("iface"): + iface = line.split(" ")[1] + if iface == iexclude: + continue + else: + output += line + return output + def parse_line(self, line, iface): name = line.split(" ")[0] values = " ".join(line.split(" ")[1:]).rstrip() @@ -65,14 +79,28 @@ class interfaces: return output def output(self, data): - print "iface %s" % data['iface'] + output = "iface %s" % data['iface'] for item in data.items(): if item[0] != "iface": if type(item[1]) is list: for i in item[1]: - print "%s %s" % (item[0], i) + output += item[0] + " " + i + "\n" else: - print "%s %s" % (item[0],item[1]) + output += item[0] + " " + item[1] + "\n" + return output + + def set_ssid(self, essid): + i = 0 + for entry in self.wifi['post-up']: + if re.search("sys_cfg_ssid", entry): + print essid + self.wifi['post-up'][i] = 'post-up /usr/bin/uaputl sys_cfg_ssid "' + essid + '"' + i += 1 + + # XXX currently works for one pre-up entry, must make it work also for arrays + def set_mac(self, mac): + self.wifi['pre-up'] = 'ifconfig uap0 hw ether ' + mac + class torrc: def __init__(self,filename):

1 0