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

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

16 Mar '12

commit cb24a6e95b013e42f72367af401dc8ee3499fb5f Merge: 9db4078 8dae835 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 15 18:06:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 src/RelativeLink/RelativeLink.sh | 19 +++++++++++++++++++ src/RelativeLink/RelativeLinkOSX.sh | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-)

1 0

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

16 Mar '12

commit c9923c3615cd34beb824847143d2aad6235b1055 Merge: cb24a6e ceea709 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 15 18:08:34 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/Info.plist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] Win/OSX: Use --enable-gcc-warnings
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit 5e38cceacbb77d1311376fc6a74002035745b82b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 9 03:37:22 2012 +0100 Win/OSX: Use --enable-gcc-warnings --- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 2eb25d7..81ab780 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -96,7 +96,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" -TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) +TOR_OPTS=-- enable-gcc-warnings --enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j $(NUM_CORES) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 13e23b5..32bea32 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor:PATH+=:$(BUILT_DIR)/bin build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS)

1 0

[torbrowser/maint-2.3] [4093 Linux Mac] Close non-TTY stdout and stderr when not in debug mode
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit 8dae8357a6426e41bbc24a10e02c8874ebedeb23 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Mar 8 18:27:30 2012 -0800 [4093 Linux Mac] Close non-TTY stdout and stderr when not in debug mode --- src/RelativeLink/RelativeLink.sh | 18 ++++++++++++++++++ src/RelativeLink/RelativeLinkOSX.sh | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index eb0cb9d..053b471 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -123,6 +123,24 @@ elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then exit 0 fi +# If the user hasn't requested 'debug mode', close whichever of stdout +# and stderr are not ttys, to keep Vidalia and the stuff loaded by/for +# it (including the system's shared-library loader) from printing +# messages to $HOME/.xsession-errors . (Users wouldn't have seen +# messages there anyway.) +# +# If the user has requested 'debug mode', don't muck with the FDs. +if [ "$debug" -ne 1 ]; then + if [ '!' -t 1 ]; then + # stdout is not a tty + exec >/dev/null + fi + if [ '!' -t 2 ]; then + # stderr is not a tty + exec 2>/dev/null + fi +fi + # If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority # before we change HOME below. (See xauth(1) and #1945.) XDM and KDM rely # on applications using this default value. diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index e301483..63ec4fb 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -19,6 +19,24 @@ if [ "x$1" = "x--debug" -o "x$1" = "x-debug" ]; then printf "\nDebug enabled.\n\n" fi +# If the user hasn't requested 'debug mode', close whichever of stdout +# and stderr are not ttys, to keep Vidalia and the stuff loaded by/for +# it (including the system's shared-library loader) from printing +# messages to be logged in /var/log/system.log . (Users wouldn't have +# seen messages there anyway.) +# +# If the user has requested 'debug mode', don't muck with the FDs. +if [ "$DEBUG_TBB" -ne 1 ]; then + if [ '!' -t 1 ]; then + # stdout is not a tty + exec >/dev/null + fi + if [ '!' -t 2 ]; then + # stderr is not a tty + exec 2>/dev/null + fi +fi + HOME="${0%%Contents/MacOS/TorBrowserBundle}" export HOME

1 0

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

16 Mar '12

commit 464b80fad38a60af145e3bd7e7718d737c0a7c6e Merge: c9923c3 5e38cce Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 15 23:54:08 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[torbrowser/master] [Linux] Initialize $debug in RelativeLink.sh
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit 60325b96430f3e05bc5ffec7a8c523760a2bb36c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Mar 8 18:22:54 2012 -0800 [Linux] Initialize $debug in RelativeLink.sh --- src/RelativeLink/RelativeLink.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 029c30a..eb0cb9d 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -113,6 +113,7 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi +debug=0 usage_message="usage: $0 [--debug]" if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then debug=1

1 0

[torbrowser/master] [4093 Linux Mac] Close non-TTY stdout and stderr when not in debug mode
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit 8dae8357a6426e41bbc24a10e02c8874ebedeb23 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Mar 8 18:27:30 2012 -0800 [4093 Linux Mac] Close non-TTY stdout and stderr when not in debug mode --- src/RelativeLink/RelativeLink.sh | 18 ++++++++++++++++++ src/RelativeLink/RelativeLinkOSX.sh | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index eb0cb9d..053b471 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -123,6 +123,24 @@ elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then exit 0 fi +# If the user hasn't requested 'debug mode', close whichever of stdout +# and stderr are not ttys, to keep Vidalia and the stuff loaded by/for +# it (including the system's shared-library loader) from printing +# messages to $HOME/.xsession-errors . (Users wouldn't have seen +# messages there anyway.) +# +# If the user has requested 'debug mode', don't muck with the FDs. +if [ "$debug" -ne 1 ]; then + if [ '!' -t 1 ]; then + # stdout is not a tty + exec >/dev/null + fi + if [ '!' -t 2 ]; then + # stderr is not a tty + exec 2>/dev/null + fi +fi + # If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority # before we change HOME below. (See xauth(1) and #1945.) XDM and KDM rely # on applications using this default value. diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index e301483..63ec4fb 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -19,6 +19,24 @@ if [ "x$1" = "x--debug" -o "x$1" = "x-debug" ]; then printf "\nDebug enabled.\n\n" fi +# If the user hasn't requested 'debug mode', close whichever of stdout +# and stderr are not ttys, to keep Vidalia and the stuff loaded by/for +# it (including the system's shared-library loader) from printing +# messages to be logged in /var/log/system.log . (Users wouldn't have +# seen messages there anyway.) +# +# If the user has requested 'debug mode', don't muck with the FDs. +if [ "$DEBUG_TBB" -ne 1 ]; then + if [ '!' -t 1 ]; then + # stdout is not a tty + exec >/dev/null + fi + if [ '!' -t 2 ]; then + # stderr is not a tty + exec 2>/dev/null + fi +fi + HOME="${0%%Contents/MacOS/TorBrowserBundle}" export HOME

1 0

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

16 Mar '12

commit cb24a6e95b013e42f72367af401dc8ee3499fb5f Merge: 9db4078 8dae835 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 15 18:06:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 src/RelativeLink/RelativeLink.sh | 19 +++++++++++++++++++ src/RelativeLink/RelativeLinkOSX.sh | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] OSX: Mark bundle as incompatible with OSX < 10.5
by erinn＠torproject.org 16 Mar '12

16 Mar '12

commit aaa5c5d22b7db88deceaaf4dde3b9aacaa6db8a4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 9 04:01:59 2012 +0100 OSX: Mark bundle as incompatible with OSX < 10.5 --- build-scripts/config/Info.plist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/Info.plist b/build-scripts/config/Info.plist index 86349b0..638a1f2 100644 --- a/build-scripts/config/Info.plist +++ b/build-scripts/config/Info.plist @@ -29,7 +29,7 @@ <key>LSHasLocalizedDisplayName</key> <false/> <key>LSMinimumSystemVersion</key> - <string>10.4</string> + <string>10.5</string> <key>LSUIElement</key> <false/> <key>NSAppleScriptEnabled</key>

1 0

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

16 Mar '12

commit 464b80fad38a60af145e3bd7e7718d737c0a7c6e Merge: c9923c3 5e38cce Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Mar 15 23:54:08 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0