March 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.3] Move the source-dance target to versions.mk
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit ba2e293ad6710a0d509c1e13ce5d2d5ef7cedce6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Feb 21 11:40:47 2012 +0100 Move the source-dance target to versions.mk --- build-scripts/linux.mk | 4 ---- build-scripts/osx.mk | 3 --- build-scripts/versions.mk | 2 ++ build-scripts/windows.mk | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a66ae77..0badb16 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -33,9 +33,6 @@ TBB_FINAL=$(BUILT_DIR)/TBBL ## Include versions (must happen after variable definitions above include $(PWD)/versions.mk -source-dance: fetch-source unpack-source - echo "We're ready for building now." - ZLIB_OPTS=--shared --prefix=$(BUILT_DIR) build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) @@ -102,7 +99,6 @@ copy-firefox: cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(BUILD_DIR) cd $(BUILD_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox -# source-dance unpack-source build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 34705bc..6f0bbc1 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -44,9 +44,6 @@ TBB_FINAL=$(BUILT_DIR)/tbbosx-dist ## Include versions (must happen after variable definitions above include $(PWD)/versions.mk -source-dance: fetch-source unpack-source - echo "We're ready for building now." - ZLIB_OPTS=--prefix=$(BUILT_DIR) ZLIB_CFLAGS="-arch $(ARCH_TYPE)" build-zlib: $(ZLIB_DIR) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index a89bf13..eae9019 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -95,6 +95,8 @@ vpath %.stamp $(STAMP_DIR) fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) | $(FETCH_DIR) ; +source-dance: fetch-source unpack-source ; + $(FETCH_DIR): mkdir -p $(FETCH_DIR) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index b1b511a..40ca57c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -56,9 +56,6 @@ TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist ## Include versions (must happen after variable definitions above include $(PWD)/versions.mk -source-dance: fetch-source unpack-source - echo "We're ready for building now." - build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES)

1 0

[torbrowser/maint-2.3] We discontinued the split bundles
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 56f1b8bfec6ad824a26a88f0596c93a91bbd152c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 27 10:36:18 2012 +0100 We discontinued the split bundles Remove instructions pointing to them as well as the Makefile targets --- build-scripts/DEPLOYMENT | 7 ++----- build-scripts/INSTALL | 10 ---------- build-scripts/linux.mk | 3 --- build-scripts/osx.mk | 3 --- build-scripts/windows.mk | 27 +-------------------------- 5 files changed, 3 insertions(+), 47 deletions(-) diff --git a/build-scripts/DEPLOYMENT b/build-scripts/DEPLOYMENT index b1727f1..fbb2f1e 100644 --- a/build-scripts/DEPLOYMENT +++ b/build-scripts/DEPLOYMENT @@ -32,14 +32,14 @@ Edit the Makefile: Run: $ make reallyclean - $ USE_PIDGIN=1 make compressed-bundle_de split-bundle_de + $ USE_PIDGIN=1 make compressed-bundle_de This will take around 10 minutes Initial check ============= -Try out tor-browser-..._de.exe and tor-browser-..._de_split.part01.exe +Try out tor-browser-..._de.exe Make sure that Firefox, Pidgin and Torbutton work and are in the right language @@ -109,9 +109,6 @@ Copy the files from Windows to the machine with your OpenPGP keys Sign them all using the "gpg -ab" command: find . -type f -exec gpg --use-agent -ab {} \; -Move the split signatures to a directory: - for i in *_split; do mkdir $i/signatures; mv $i/*.asc $i/signatures;done - Upload to www.torproject.org ============================ diff --git a/build-scripts/INSTALL b/build-scripts/INSTALL index 34cd085..f435918 100644 --- a/build-scripts/INSTALL +++ b/build-scripts/INSTALL @@ -206,16 +206,6 @@ Run msysDTK-1.0.1.exe and install it into C:\msys\1.0 This will give you Perl, which is necessary for the OpenSSL build -Installing WinRAR -================= - -To produce self extracting split bundles, we use WinRAR. - -Download a trial copy from the WinRAR website: -http://www.rarlab.com/rar/wrar380.exe - -Install it into C:\Program Files\WinRAR - Installing autoconf update ========================== diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0badb16..620a070 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -124,9 +124,6 @@ PIDGIN=$(COMPILED_BINS)/pidgin ## Location of utility applications WGET:=$(shell which wget) -## Size of split archive volumes for WinRAR -SPLITSIZE=1440k - ## Destination for the generic bundle DEST=generic-bundle diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6f0bbc1..236d595 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -136,9 +136,6 @@ PIDGIN=$(COMPILED_BINS)/pidgin ## Location of utility applications WGET:=$(shell which wget) -## Size of split archive volumes for WinRAR -SPLITSIZE=1440k - ## Destination for the generic bundle DEST=generic-bundle diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 40ca57c..13e23b5 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -132,9 +132,6 @@ ZLIB=$(COMPILED_LIBS) LIBEVENT=$(COMPILED_LIBS) -## Size of split archive volumes for WinRAR -SPLITSIZE=1440k - ## Destination for the generic bundle DEST="Generic Bundle" @@ -185,7 +182,7 @@ all-bundles-both: USE_PIDGIN=0 make -f windows.mk all-bundles make -f windows.mk clean -all-bundles: all-compressed-bundles all-split-bundles +all-bundles: all-compressed-bundles all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_de \ @@ -200,19 +197,6 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_zh-CN \ compressed-bundle_it -all-split-bundles: split-bundle_ar \ - split-bundle_de \ - split-bundle_en-US \ - split-bundle_es-ES \ - split-bundle_fa \ - split-bundle_fr \ - split-bundle_nl \ - split-bundle_pl \ - split-bundle_pt-PT \ - split-bundle_ru \ - split-bundle_zh-CN \ - split-bundle_it - ## ## Cleanup ## @@ -228,10 +212,8 @@ clean: reallyclean: clean rm -fr $(IM_COMPRESSED_BASENAME)*_*.exe rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar - rm -fr $(IM_COMPRESSED_BASENAME)*_*_split rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.exe rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar - rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*_split ## ## Scan .exe files against VirusTotal to check for false positives @@ -342,8 +324,6 @@ bundle_%: LANGCODE=$* make -f windows.mk bundle-localized compressed-bundle_%: LANGCODE=$* make -f windows.mk compressed-bundle-localized -split-bundle_%: - LANGCODE=$* make -f windows.mk split-bundle-localized bundle-localized_%.stamp: make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \ @@ -356,11 +336,6 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) -split-bundle-localized: bundle-localized_$(LANGCODE).stamp - rm -fr $(COMPRESSED_NAME)_$(LANGCODE)_split; mkdir $(COMPRESSED_NAME)_$(LANGCODE)_split - cd $(NAME)_$(LANGCODE); $(WINRAR) a -r -s -ibck -sfx -v$(SPLITSIZE) \ - ../$(COMPRESSED_NAME)_$(LANGCODE)_split/$(COMPRESSED_NAME)_$(LANGCODE)_split.exe $(NAME) - copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$* mkdir $(NAME)_$*

1 0

[torbrowser/maint-2.3] remove the killbrowser patch for Vidalia
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit ff81391c8281f2f9d2f47636df7be7e313d859f9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Feb 28 14:14:14 2012 +0100 remove the killbrowser patch for Vidalia We haven't used it so far, and it doesn't even apply to current Vidalia --- build-scripts/INSTALL | 11 ---------- .../vidalia/vidalia-killbrowser.patch | 22 -------------------- 2 files changed, 0 insertions(+), 33 deletions(-) diff --git a/build-scripts/INSTALL b/build-scripts/INSTALL index f435918..cd18032 100644 --- a/build-scripts/INSTALL +++ b/build-scripts/INSTALL @@ -423,17 +423,6 @@ Then run: > cmake -G "MinGW Makefiles" . > mingw32-make -Patches for possible future inclusion -===================================== - -A patch to close the Browser when Vidalia exits is in: - ../src/current-patches/vidalia-killbrowser.patch - -This is not yet useful, since killing FirefoxPortable does not cause -Firefox to exit. This patch has not yet been applied to Vidalia. - -Currently this is not being used by the Torbrowser. - Further information =================== diff --git a/src/current-patches/vidalia/vidalia-killbrowser.patch b/src/current-patches/vidalia/vidalia-killbrowser.patch deleted file mode 100644 index 551b391..0000000 --- a/src/current-patches/vidalia/vidalia-killbrowser.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: src/vidalia/mainwindow.cpp -=================================================================== ---- src/vidalia/mainwindow.cpp (revision 2213) -+++ src/vidalia/mainwindow.cpp (working copy) -@@ -260,6 +260,17 @@ - _torControl->stop(); - } - -+ if (_browserProcess->state() != QProcess::NotRunning) { -+ /* The browser is still running -- ask it to close. -+ Currently this appears to have no affect, probably because killing -+ FirefoxPortable doesn't kill firefox.exe. Switching to kil() did -+ not help either. Once Vidalia starts firefox.exe directly this should work. */ -+ // Ignore the finished signal -+ QObject::disconnect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0); -+ // Send the close request -+ _browserProcess->terminate(); -+ } -+ - /* Disconnect all of the TorControl object's signals */ - QObject::disconnect(_torControl, 0, 0, 0); -

1 0

[torbrowser/maint-2.3] OSX: Use arch option when building Qt
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 7e9868d94af77a10966364b14898f72978cd461d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Feb 28 00:27:55 2012 +0100 OSX: Use arch option when building Qt --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 236d595..2eb25d7 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -67,7 +67,7 @@ endif QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ - -fast -release -no-framework -nomake demos -nomake examples $(SDK) + -fast -release -no-framework -nomake demos -nomake examples $(SDK) -arch $(ARCH_TYPE) QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS)

1 0

[torbrowser/maint-2.3] Remove processtest, as it is unused now
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 3fcad83c8e6e78f3add2d695f9e5ef80ca40558c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Feb 21 11:22:49 2012 +0100 Remove processtest, as it is unused now Launching Firefox from Vidalia works fine --- src/processtest/GPL-v2.txt | 339 ------------------------------------ src/processtest/README | 12 -- src/processtest/browserprocess.cpp | 54 ------ src/processtest/browserprocess.h | 53 ------ src/processtest/main.cpp | 52 ------ src/processtest/processtest.cpp | 103 ----------- src/processtest/processtest.h | 69 -------- src/processtest/processtest.pro | 13 -- 8 files changed, 0 insertions(+), 695 deletions(-) diff --git a/src/processtest/GPL-v2.txt b/src/processtest/GPL-v2.txt deleted file mode 100644 index d511905..0000000 --- a/src/processtest/GPL-v2.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) 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 -this service 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 make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. 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. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE 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. - - 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 -convey 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 2 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, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision 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, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This 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. diff --git a/src/processtest/README b/src/processtest/README deleted file mode 100644 index c4c8dfb..0000000 --- a/src/processtest/README +++ /dev/null @@ -1,12 +0,0 @@ -### -### Test invoking Firefox from Qt -### Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> -### - -Build instructions ------------------- - -For mingw32 on Windows: - -$ qmake -$ mingw32-make diff --git a/src/processtest/browserprocess.cpp b/src/processtest/browserprocess.cpp deleted file mode 100644 index b2f974b..0000000 --- a/src/processtest/browserprocess.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************** - * This file is distributed under the following license - * - * Copyright (C) 2007, Matt Edman - * Copyright (C) 2007, Steven J. Murdoch - * <http://www.cl.cam.ac.uk/users/sjm217/> - * - * 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 2 - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - -/** - ** Test invoking Firefox from Qt - ** Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> - **/ - -#include <QString> - -#include "browserprocess.h" - -BrowserProcess::BrowserProcess(QObject *parent) -: QProcess(parent) -{ - // Call error handling routine on errors - QObject::connect(this, SIGNAL(error(QProcess::ProcessError)), this, SLOT(onError(QProcess::ProcessError))); -} - -void -BrowserProcess::start(QString app, QStringList args) -{ - // Start the specified application - QProcess::start(app, args, QIODevice::ReadOnly | QIODevice::Text); -} - -void -BrowserProcess::onError(QProcess::ProcessError error) -{ - // Pass up error messages on startup, but ignore the rest - if (error == QProcess::FailedToStart) { - emit startFailed(errorString()); - } -} diff --git a/src/processtest/browserprocess.h b/src/processtest/browserprocess.h deleted file mode 100644 index e449e4c..0000000 --- a/src/processtest/browserprocess.h +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************** - * This file is distributed under the following license - * - * Copyright (C) 2007, Matt Edman - * Copyright (C) 2007, Steven J. Murdoch - * <http://www.cl.cam.ac.uk/users/sjm217/> - * - * 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 2 - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - -/** - ** Test invoking Firefox from Qt - ** Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> - **/ - -#ifndef _BROWSERPROCESS_H -#define _BROWSERPROCESS_H - -#include <QProcess> - -class BrowserProcess : public QProcess -{ - Q_OBJECT - -public: - // Default constructor - BrowserProcess(QObject *parent = 0); - // Start the specified application - void start(QString app, QStringList args); - -private slots: - // Invoked when underlying QProcess fails - void onError(QProcess::ProcessError error); - -signals: - // Invoked when start() fails - void startFailed(QString errorMessage); -}; - -#endif diff --git a/src/processtest/main.cpp b/src/processtest/main.cpp deleted file mode 100644 index c69f461..0000000 --- a/src/processtest/main.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************** - * This file is distributed under the following license - * - * Copyright (C) 2007, Steven J. Murdoch - * <http://www.cl.cam.ac.uk/users/sjm217/> - * - * 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 2 - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - -/** - ** Test invoking Firefox from Qt - ** Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> - **/ - -#include <QApplication> -#include <QCoreApplication> -#include <iostream> - -#include "processtest.h" - -int main(int argc, char *argv[]) -{ - // Initialize Qt - QApplication app(argc, argv); - - // Check that a command has been specified - if(QCoreApplication::arguments().size() < 2) - { - std::cerr << "Usage: processtest COMMANDLINE\n"; - return 1; - } - - // Initialize the main window - ProcessTest test; - test.show(); - - // Start the application - return app.exec(); -} diff --git a/src/processtest/processtest.cpp b/src/processtest/processtest.cpp deleted file mode 100644 index 625a14e..0000000 --- a/src/processtest/processtest.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/**************************************************************** - * This file is distributed under the following license - * - * Copyright (C) 2007, Steven J. Murdoch - * <http://www.cl.cam.ac.uk/users/sjm217/> - * - * 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 2 - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - -/** - ** Test invoking Firefox from Qt - ** Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> - **/ - -#include <QPushButton> -#include <QStringList> -#include <QCoreApplication> - -#include "processtest.h" -#include "browserprocess.h" - -ProcessTest::ProcessTest(QWidget *parent) - : QWidget(parent) -{ - // Set the window size - setFixedSize(200, 50); - - // Get the command line (main.cpp already checked the size - _cmd = QCoreApplication::arguments().at(1); - - // Display the button - _button = new QPushButton(tr("Go"), this); - _button->setGeometry(10, 10, 180, 30); - - // Initialize the process handler - _browser = new BrowserProcess(); - _appState = Stopped; - - // Connect up the button - QObject::connect(_button, SIGNAL(clicked()), this, SLOT(onClicked())); - - // Connect up the process handler - QObject::connect(_browser, SIGNAL(started()), this, SLOT(onStarted())); - QObject::connect(_browser, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(onFinished())); - QObject::connect(_browser, SIGNAL(startFailed(QString)), this, SLOT(onFailed())); -} - -void ProcessTest::onClicked() -{ - if (Started == _appState) - { - // Application is running: kill it - _button->setText(tr("Terminating...")); - _appState = Terminating; - _browser->terminate(); - } - else if (Terminating == _appState) - { - // Application is terminating: really kill it - _button->setText(tr("Killing...")); - _browser->kill(); - } - else - { - // Application is not running: start it - _button->setText(tr("Starting...") + _cmd); - _browser->start(_cmd, QStringList()); - } -} - -void ProcessTest::onStarted() -{ - // Application has started - _button->setText(tr("Running...")); - _appState = Started; -} - -void ProcessTest::onFinished() -{ - // Application has finished - _button->setText(tr("Stopped")); - _appState = Stopped; -} - -void ProcessTest::onFailed() -{ - // Application failed to start - _button->setText(tr("Failed")); - _appState = Stopped; -} diff --git a/src/processtest/processtest.h b/src/processtest/processtest.h deleted file mode 100644 index 31b9a5e..0000000 --- a/src/processtest/processtest.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************** - * This file is distributed under the following license - * - * Copyright (C) 2007, Steven J. Murdoch - * <http://www.cl.cam.ac.uk/users/sjm217/> - * - * 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 2 - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - -/** - ** Test invoking Firefox from Qt - ** Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> - **/ - -#ifndef PROCESSTEST_H -#define PROCESSTEST_H - -#include <QWidget> -#include <QPushButton> - -#include "browserprocess.h" - -class ProcessTest : public QWidget -{ - Q_OBJECT - -public: - ProcessTest(QWidget *parent = 0); -private slots: - // App has started - void onStarted(); - // App has exited - void onFinished(); - // App startup failed - void onFailed(); - // Button was clicked - void onClicked(); -private: - // What state is the application in - enum AppStateEnum { - Stopped, - Started, - Terminating - }; - - // The push button - QPushButton *_button; - // Process handler - BrowserProcess *_browser; - // Command line to start - QString _cmd; - // Is the application running - AppStateEnum _appState; -}; - -#endif diff --git a/src/processtest/processtest.pro b/src/processtest/processtest.pro deleted file mode 100644 index 6d75d7f..0000000 --- a/src/processtest/processtest.pro +++ /dev/null @@ -1,13 +0,0 @@ -### -### Test invoking Firefox from Qt -### Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> -### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -HEADERS += browserprocess.h processtest.h -SOURCES += browserprocess.cpp main.cpp processtest.cpp

1 0

[torbrowser/maint-2.3] Remove the qt-interlock patch
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit f3831bf3d32a5a5246c0d850a4bb4ff806fec5e5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Feb 28 14:13:00 2012 +0100 Remove the qt-interlock patch It hasn't been needed since qt 4.4.4 and we're way past that --- src/current-patches/qt/qt-interlock-fix.patch | 36 ------------------------- 1 files changed, 0 insertions(+), 36 deletions(-) diff --git a/src/current-patches/qt/qt-interlock-fix.patch b/src/current-patches/qt/qt-interlock-fix.patch deleted file mode 100644 index 78464fc..0000000 --- a/src/current-patches/qt/qt-interlock-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- qatomic_windows.h-orig Wed Nov 26 14:36:33 2008 -+++ qatomic_windows.h Wed Nov 26 15:11:57 2008 -@@ -190,13 +190,32 @@ - - #if !(defined Q_CC_BOR) || (__BORLANDC__ < 0x560) - -+#if defined(Q_CC_GNU) -+#include <windows.h> -+#endif -+ -+#ifndef __INTERLOCKED_DECLARED -+ -+extern "C" { -+__declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long); -+__declspec(dllimport) long __stdcall InterlockedIncrement(long *); -+__declspec(dllimport) long __stdcall InterlockedDecrement(long *); -+__declspec(dllimport) long __stdcall InterlockedExchange(long *, long); -+__declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long); -+} -+ -+#endif -+/* - extern "C" { - __declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long); - __declspec(dllimport) long __stdcall InterlockedIncrement(long *); - __declspec(dllimport) long __stdcall InterlockedDecrement(long *); - __declspec(dllimport) long __stdcall InterlockedExchange(long *, long); - __declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long); --} -+} -+*/ -+ -+ - - #else -

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 5cc51cbe149918b700e4d8aa4f0d95772fe1357e Merge: 33a8fe2 ff81391 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 8 17:25:40 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.dev | 35 - build-scripts/DEPLOYMENT | 9 +- build-scripts/INSTALL | 89 +-- build-scripts/config/dot_mozconfig | 1 + .../App/DefaultData/profile/bookmarks.html | 17 - .../firefox-portable/Data/profile/bookmarks.html | 24 - build-scripts/config/linux-prefs.js | 157 -- build-scripts/config/no-polipo.js | 178 --- build-scripts/config/polipo-Makefile | 144 -- build-scripts/config/polipo.conf | 161 --- build-scripts/config/prefs.js | 176 --- build-scripts/config/vidalia.conf.ff+pidgin | 2 - build-scripts/config/vidalia.conf.ff+pidgin-linux | 2 - build-scripts/config/windows-4.0.js | 14 +- build-scripts/configure-firefox.sh | 39 - build-scripts/linux.mk | 192 +-- build-scripts/osx.mk | 208 +-- build-scripts/patch-any-src.sh | 2 +- build-scripts/patch-firefox-language.sh | 2 - build-scripts/patch-mozilla-build.sh | 2 +- build-scripts/patch-pidgin-language.sh | 2 - build-scripts/patch-vidalia-language.sh | 2 - build-scripts/pyget.py | 67 - build-scripts/versions.mk | 238 +++- build-scripts/windows.mk | 211 +-- docs/ToaST-startup.txt | 90 -- docs/rationale.txt | 56 - docs/torusb-notes.txt | 82 -- docs/traces.txt | 4 +- docs/two-firefox.txt | 72 - src/FindTraces/dumpreg.py | 2 - src/FindTraces/registrydict.py | 1 - src/RelativeLink/RelativeLink.sh | 5 +- src/RelativeLink/RelativeLinkOSX.sh | 2 +- .../0001-Firefox4-Fix-SOCKS-timeout.patch | 1500 -------------------- ...ock-Components.interfaces-lookupMethod-fr.patch | 50 - ...ock-Components.interfaces-lookupMethod-fr.patch | 50 - ...-Make-Intermediate-Cert-Store-memory-only.patch | 300 ---- ...-Make-Intermediate-Cert-Store-memory-only.patch | 283 ---- ...fox5-Make-Permissions-Manager-memory-only.patch | 94 -- ...fox4-Make-Permissions-Manager-memory-only.patch | 94 -- src/archived-patches/0005-Smash-the-state.patch | 37 - src/archived-patches/vidalia-altlauncher.patch | 185 --- src/archived-patches/vidalia-miniupnp.patch | 185 --- src/archived-patches/vidalia-startbrowser.patch | 254 ---- src/archived-patches/vidalia-startim.patch | 257 ---- src/archived-patches/vidalia-startproxy.patch | 429 ------ .../vidalia-startproxyarguments.patch | 69 - src/current-patches/mozilla-build/start-msvc.patch | 2 +- src/current-patches/qt/qt-interlock-fix.patch | 36 - .../vidalia/vidalia-killbrowser.patch | 22 - src/osx-sandboxes/polipo-sandbox/polipo-10.5.sb | 70 - src/osx-sandboxes/polipo-sandbox/polipo-wrapper | 70 - src/osx-sandboxes/polipo-sandbox/polipo.sb | 71 - src/processtest/GPL-v2.txt | 339 ----- src/processtest/README | 13 - src/processtest/browserprocess.cpp | 55 - src/processtest/browserprocess.h | 54 - src/processtest/main.cpp | 53 - src/processtest/processtest.cpp | 104 -- src/processtest/processtest.h | 70 - src/processtest/processtest.pro | 14 - 62 files changed, 391 insertions(+), 6657 deletions(-)

1 0

[torbrowser/master] Make TBB work on KDE 4
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit ff3308f592e6656658dbb6b52f7be7bac2a6db94 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 23 05:44:33 2012 +0100 Make TBB work on KDE 4 On KDE 4 desktops, Qt apps try to load the KDE 4 style called Oxygen. This causes a few other Qt shared libs to be loaded, and we don't ship them all, which causes a crash. Tomásfound this cool solution, which means we don't have to ship more libraries than we do now. Basically we tell Vidalia to bypass auto-detecting a style and just pre-pick a sane one. If the user manually overrides this, Vidalia will still crash, but this should work for the vast majority of users for now. Works around bug 5214. --- src/RelativeLink/RelativeLink.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 14f6423..692885c 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -193,7 +193,7 @@ if [ "${debug}" ]; then # XXX Someday we should pass whatever command-line arguments we got # (probably filenames or URLs) to Firefox. ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ - --datadir Data/Vidalia/ + --datadir Data/Vidalia/ -style Cleanlooks printf "\nVidalia exited with the following return code: $?\n" fi @@ -202,7 +202,7 @@ printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" cd "${HOME}" # XXX Someday we should pass whatever command-line arguments we got # (probably filenames or URLs) to Firefox. -./App/vidalia --datadir Data/Vidalia/ +./App/vidalia --datadir Data/Vidalia/ -style Cleanlooks exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Vidalia exited abnormally. Exit code: $exitcode"

1 0

[torbrowser/master] OSX: Don't use sudo to install libevent
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 5685f0c236eceb0a22040d3bf510476a0495e7cf Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 3 16:16:03 2012 +0100 OSX: Don't use sudo to install libevent There's no need to do so, and it prevents the other stuff from working without privileges --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a02fc33..81e10f0 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -97,7 +97,7 @@ LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-d build-libevent: cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j2 - cd $(LIBEVENT_DIR) && sudo make install + cd $(LIBEVENT_DIR) && make install TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"

1 0

[torbrowser/master] OSX: Remove the universal option when building qt
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 5042c42451efea7cf96deeebbc4c3a33d6bc6d15 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Jan 28 14:30:52 2012 +0100 OSX: Remove the universal option when building qt The rationale is that we don't build universal bundles, so we don't need a universal qt. --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 13b802c..20ea849 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -83,7 +83,7 @@ endif cd $(OPENSSL_DIR) && make install QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) -QT_BUILD_PREFS=-system-zlib -universal -confirm-license -opensource -openssl-linked -no-qt3support \ +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ -fast -release -no-framework -nomake demos -nomake examples $(SDK) QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib build-qt:

1 0