[tor-commits] [tor-messenger-build/master] gcc: build from a non-random directory
commit 65df08c4d9d2c3b9b354d5b0b2191b1278e0dd99 Author: Nicolas Vigier Date: Sat Oct 17 01:46:42 2015 +0200 gcc: build from a non-random directory --- projects/gcc/build |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/gcc/build b/projects/gcc/build index d727bc5..03cfcbd 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -1,8 +1,9 @@ #!/bin/sh set -e distdir=/var/tmp/dist/[% project %] -tar xf [% project %]-[% c("version") %].tar.bz2 -cd [% project %]-[% c("version") %] +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 +cd /var/tmp/build/[% project %]-[% c("version") %] ./configure --prefix=$distdir [% c("var/configure_opt") %] make -j4 make install ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Fix timestamp on instantbird files
commit 8a2df1161ffe8b4eacf10b62cfc4399db38c3d96 Author: Nicolas Vigier Date: Fri Oct 16 20:51:41 2015 +0200 Fix timestamp on instantbird files --- projects/tor-messenger/build |1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 94dba3b..c105299 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -13,6 +13,7 @@ mv bundle/instantbird bundle/Messenger [% ELSE -%] mkdir bundle/Messenger tar xf [% c('input_files_by_name/instantbird') %] -C bundle/Messenger --strip 1 +find bundle/Messenger -exec touch -m -t $(date -d @[% c('timestamp') %] +%Y%m%d%H%M) {} \; [% END -%] [% IF c("var/linux") -%] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Remove nss *.chk files
commit 37d39c9b00c4e4c341a6f614a88834e3b59416a9 Author: Nicolas Vigier Date: Fri Oct 16 20:48:56 2015 +0200 Remove nss *.chk files --- projects/tor-messenger/build |6 ++ 1 file changed, 6 insertions(+) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index d3d4c9b..94dba3b 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -15,6 +15,12 @@ mkdir bundle/Messenger tar xf [% c('input_files_by_name/instantbird') %] -C bundle/Messenger --strip 1 [% END -%] +[% IF c("var/linux") -%] +# remove non reproducible files (FIPS-140) +# Tor Browser removes them too +rm -f bundle/Messenger/*.chk +[% END -%] + mkdir bundle/Messenger/TorMessenger tar xf [% c('input_files_by_name/bundle-data') %] -C bundle/Messenger/TorMessenger ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [gettor/master] Update AUTHORS file; Sukhbir is no longer core developer
commit 3a1963064933e35ac3e25cab3e0964951c778778 Author: Sukhbir Singh Date: Fri Oct 16 14:10:58 2015 -0400 Update AUTHORS file; Sukhbir is no longer core developer --- AUTHORS |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index d118105..6e3edb0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,5 @@ Current maintainer/core developers: Israel Leiva 4096R/540BFC0E -Sukhbir Sing 4096R/B297B391 Past core developers: Jacob Appelbaum @@ -11,3 +10,4 @@ Contributors: Runa A. Sandvik Nima Fatemi Poly +Sukhbir Singh 4096R/B297B391 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] libgpg-error: set SOURCE_DATE_EPOCH
commit 0577a9fef40d6259bd7327a886c40328c2df9e88 Author: Nicolas Vigier Date: Fri Oct 16 01:07:37 2015 +0200 libgpg-error: set SOURCE_DATE_EPOCH --- projects/libgpg-error/build |1 + 1 file changed, 1 insertion(+) diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index 8768dc7..5df344e 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -11,6 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] cp $rootdir/lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.darwin10.h echo 'int main() {}' > src/gen-posix-lock-obj.c [% END -%] +export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) ./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] make -j4 make prefix="$distdir" install ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] libgcrypt: remove build timestamp
commit 7be4daacef65c17c96c5eb861d502a25d3b57997 Author: Nicolas Vigier Date: Thu Oct 15 19:37:55 2015 +0200 libgcrypt: remove build timestamp --- projects/libgcrypt/build |1 + 1 file changed, 1 insertion(+) diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index 9b9506f..37f4a0a 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -15,6 +15,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # our compiler does not like -g sed -i 's/ac_cv_prog_cc_g=yes/ac_cv_prog_cc_g=no/' configure [% END -%] +sed -i 's/^BUILD_TIMESTAMP=.*/BUILD_TIMESTAMP=2000-01-01T00:00+/' configure ./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] make -j4 make prefix=$distdir install ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] instantbird: set MOZ_BUILD_DATE based on commit date
commit 750686ef16a6688cac791c819d30303f21abc496 Author: Nicolas Vigier Date: Fri Oct 16 17:06:04 2015 +0200 instantbird: set MOZ_BUILD_DATE based on commit date --- projects/instantbird/build |1 + 1 file changed, 1 insertion(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index a422cce..1f79af7 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -3,6 +3,7 @@ set -e rootdir=$(pwd) export SHELL=/bin/sh export HOME=$rootdir +export MOZ_BUILD_DATE=$(date -d @[% c('timestamp') %] +%Y%m%d%H) [% IF c('var/osx') -%] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcchost') }) %] ln -s /var/tmp/dist/gcc/bin/gcc /var/tmp/dist/gcc/bin/cc ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] instantbird: build from a non-random directory
commit d9bf8b2cca86a1285578e3521afcd1a451fda306 Author: Nicolas Vigier Date: Fri Oct 16 17:07:05 2015 +0200 instantbird: build from a non-random directory --- projects/instantbird/build | 37 +++-- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index 1f79af7..5d91c50 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -31,44 +31,45 @@ ln -s /usr/bin/yasm-1 /var/tmp/dist/yasm/bin/yasm export PATH="/var/tmp/dist/yasm/bin:$PATH" [% END -%] cd $rootdir -tar xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] mkdir moz cd moz tar xf ../[% c('input_files_by_name/mozilla-src') %] -mv mozilla-* ../[% project %]-[% c('version') %]/mozilla -cd ../[% project %]-[% c('version') %] +mv mozilla-* /var/tmp/build/[% project %]-[% c('version') %]/mozilla +cd /var/tmp/build/[% project %]-[% c('version') %] mkdir im/branding/messenger cp -R im/branding/nightly/* im/branding/messenger/ -for patch in $(ls -1 ../*.patch | sort) +for patch in $(ls -1 $rootdir/*.patch | sort) do patch -p1 < $patch done -for patch in $(ls -1 ../branding/*.patch | sort) +for patch in $(ls -1 $rootdir/branding/*.patch | sort) do patch -p1 < $patch done -cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt +cat $rootdir/spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt [% IF c("var/osx") -%] -cp ../cert_override.txt im/app/profile +cp $rootdir/cert_override.txt im/app/profile [% END -%] -cp ../xmppRegister* im/content/ +cp $rootdir/xmppRegister* im/content/ -cp ../branding/default*.png im/branding/messenger/gtk/ -cp ../branding/convWindow*.png im/branding/messenger/gtk/ -cp ../branding/blistWindow*.png im/branding/messenger/gtk/ +cp $rootdir/branding/default*.png im/branding/messenger/gtk/ +cp $rootdir/branding/convWindow*.png im/branding/messenger/gtk/ +cp $rootdir/branding/blistWindow*.png im/branding/messenger/gtk/ -cp ../branding/blistWindow.ico im/branding/messenger/windows/ -cp ../branding/convWindow.ico im/branding/messenger/windows/ -cp ../branding/default.ico im/branding/messenger/windows/ +cp $rootdir/branding/blistWindow.ico im/branding/messenger/windows/ +cp $rootdir/branding/convWindow.ico im/branding/messenger/windows/ +cp $rootdir/branding/default.ico im/branding/messenger/windows/ -cp ../branding/instantbird.ico im/branding/messenger/ -cp ../branding/instantbird.icns im/branding/messenger/ +cp $rootdir/branding/instantbird.ico im/branding/messenger/ +cp $rootdir/branding/instantbird.icns im/branding/messenger/ -cp ../branding/about.png im/branding/messenger/content/ +cp $rootdir/branding/about.png im/branding/messenger/content/ cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 @@ -80,7 +81,7 @@ then fi cd .. -cp ../[% c('input_files_by_name/mozconfig') %] .mozconfig +cp $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig ./mozilla/mach build || ./mozilla/mach build ./mozilla/mach package mv obj-*/dist/*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Remove __DATE__ and __TIME__ references from NSS
commit e4bfbaece05f5bcebb48302bfa995828c2e63ead Author: Nicolas Vigier Date: Fri Oct 16 18:52:55 2015 +0200 Remove __DATE__ and __TIME__ references from NSS --- ...8ea23862252b-remove__DATE__and__TIME__.nsspatch | 345 projects/instantbird/build | 10 + projects/instantbird/config|1 + 3 files changed, 356 insertions(+) diff --git a/projects/instantbird/8ea23862252b-remove__DATE__and__TIME__.nsspatch b/projects/instantbird/8ea23862252b-remove__DATE__and__TIME__.nsspatch new file mode 100644 index 000..e601b2d --- /dev/null +++ b/projects/instantbird/8ea23862252b-remove__DATE__and__TIME__.nsspatch @@ -0,0 +1,345 @@ +# HG changeset patch +# User Mike Hommey +# Date 1436438559 -7200 +# Thu Jul 09 12:42:39 2015 +0200 +# Node ID 8ea23862252b009f097807267f43248a820f673e +# Parent cac90b6155c9f140f63a75d38c7d7da8d2d6ca55 +Bug 1169174, Remove __DATE__ and __TIME__ references from NSS, r=rrelyea + +diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/builtins/binst.c +--- a/lib/ckfw/builtins/binst.cThu May 28 15:34:09 2015 -0700 b/lib/ckfw/builtins/binst.cThu Jul 09 12:42:39 2015 +0200 +@@ -65,11 +65,10 @@ + NSSCKFWInstance *fwInstance + ) + { +- extern const char __nss_builtins_rcsid[]; +- extern const char __nss_builtins_sccsid[]; ++ extern const char __nss_builtins_version[]; + volatile char c; /* force a reference that won't get optimized away */ + +- c = __nss_builtins_rcsid[0] + __nss_builtins_sccsid[0]; ++ c = __nss_builtins_version[0]; + return nss_builtins_LibraryVersion; + } + +diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/builtins/ckbiver.c +--- a/lib/ckfw/builtins/ckbiver.c Thu May 28 15:34:09 2015 -0700 b/lib/ckfw/builtins/ckbiver.c Thu Jul 09 12:42:39 2015 +0200 +@@ -13,14 +13,7 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_builtins_rcsid[] = "$Header: NSS Builtin Trusted Root CAs " +-NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING +-" " __DATE__ " " __TIME__ " $"; +-const char __nss_builtins_sccsid[] = "@(#)NSS Builtin Trusted Root CAs " +-NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING +-" " __DATE__ " " __TIME__; ++const char __nss_builtins_version[] = "Version: NSS Builtin Trusted Root CAs " ++NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/capi/ckcapiver.c +--- a/lib/ckfw/capi/ckcapiver.cThu May 28 15:34:09 2015 -0700 b/lib/ckfw/capi/ckcapiver.cThu Jul 09 12:42:39 2015 +0200 +@@ -12,14 +12,7 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_ckcapi_rcsid[] = "$Header: NSS Access to Microsoft Certificate Store " +-NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING +-" " __DATE__ " " __TIME__ " $"; +-const char __nss_ckcapi_sccsid[] = "@(#)NSS Access to Microsoft Certificate Store " +-NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING +-" " __DATE__ " " __TIME__; ++const char __nss_ckcapi_version[] = "Version: NSS Access to Microsoft Certificate Store " ++NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/nssmkey/ckmkver.c +--- a/lib/ckfw/nssmkey/ckmkver.c Thu May 28 15:34:09 2015 -0700 b/lib/ckfw/nssmkey/ckmkver.c Thu Jul 09 12:42:39 2015 +0200 +@@ -12,14 +12,7 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_ckmk_rcsid[] = "$Header: NSS Access to the MAC OS X Key Ring " +-NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING +-" " __DATE__ " " __TIME__ " $"; +-const char __nss_ckmk_sccsid[] = "@(#)NSS Access to the MAC OS X Key Ring " +-NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING +-" " __DATE__ " " __TIME__; ++const char __nss_ckmk_version[] = "Version: NSS Access to the MAC OS X Key Ring " ++NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING; +diff -r cac90b6155c9 -r 8ea23862252b lib/freebl/freeblver.c +--- a/lib/freebl/freeblver.c Thu May 28 15:34:09 2015 -0700 b/lib/freebl/freeblver.c Thu Jul 09 12:42:39 2015 +0200 +@@ -13,12 +13,6 @@ + #endif + + /* +- * Version information for the 'ident' and 'what commands +- * +- * NOTE: the first component of the concatenated rcsid string +- * must not end in a '$' to prevent rcs keyword substitution. ++ * Version information + */ +-const char __nss_freebl_rcsid[] = "$Header: NSS " SOFTOKEN_
[tor-commits] [tor-messenger-build/master] keyring/libgcrypt.gpg: add key 031E C253 6E58 0D8E A286 A9F2 2071 B08A 33BD 3F06
commit e987a153ca6d5f402e04ea8fb5a52f89791e5393 Author: Nicolas Vigier Date: Thu Oct 15 18:08:57 2015 +0200 keyring/libgcrypt.gpg: add key 031E C253 6E58 0D8E A286 A9F2 2071 B08A 33BD 3F06 --- keyring/libgcrypt.gpg | Bin 1355 -> 2574 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/libgcrypt.gpg b/keyring/libgcrypt.gpg index 5334158..41c8361 100644 Binary files a/keyring/libgcrypt.gpg and b/keyring/libgcrypt.gpg differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] libgcrypt: update to version 1.6.4
commit f47ae824bdc20efb4b9ec5f6107cdccb38d7ccd6 Author: Nicolas Vigier Date: Thu Oct 15 19:34:37 2015 +0200 libgcrypt: update to version 1.6.4 --- projects/libgcrypt/config |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config index 90c5ab7..25d3c8e 100644 --- a/projects/libgcrypt/config +++ b/projects/libgcrypt/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.6.2 +version: 1.6.4 remote_docker: 1 lsb_release: id: Ubuntu @@ -29,7 +29,7 @@ targets: release: 12.04 codename: precise input_files: - - URL: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.2.tar.bz2 + - URL: 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-[% c("version") %].tar.bz2' sig_ext: sig file_gpg_id: 1 gpg_keyring: libgcrypt.gpg ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] libgcrypt: set SOURCE_DATE_EPOCH
commit 85bfa116287b3d65a715bde2d4f5b59fc54b319c Author: Nicolas Vigier Date: Fri Oct 16 01:08:12 2015 +0200 libgcrypt: set SOURCE_DATE_EPOCH --- projects/libgcrypt/build |1 + 1 file changed, 1 insertion(+) diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index 37f4a0a..9bd0710 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -16,6 +16,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] sed -i 's/ac_cv_prog_cc_g=yes/ac_cv_prog_cc_g=no/' configure [% END -%] sed -i 's/^BUILD_TIMESTAMP=.*/BUILD_TIMESTAMP=2000-01-01T00:00+/' configure +export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) ./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] make -j4 make prefix=$distdir install ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] binutils: use --enable-deterministic-archives
commit b144bb323684534f623a3f9fba574dacc15eba84 Author: Nicolas Vigier Date: Thu Oct 15 22:28:12 2015 +0200 binutils: use --enable-deterministic-archives --- projects/binutils/config |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/binutils/config b/projects/binutils/config index 0882ea5..7bd26f5 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -10,12 +10,12 @@ var: deps: - build-essential - bison - configure_opt: '--disable-multilib --enable-gold' + configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives' targets: windows-i686: var: - configure_opt: '--target=i686-w64-mingw32 --disable-multilib' + configure_opt: '--target=i686-w64-mingw32 --disable-multilib --enable-deterministic-archives' lsb_release: id: Ubuntu release: 14.10 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] libgpg-error: build from a non-random directory
commit a22d3a05e619796865fa545ee8ff1fecc91184a6 Author: Nicolas Vigier Date: Thu Oct 15 18:00:41 2015 +0200 libgpg-error: build from a non-random directory --- projects/libgpg-error/build |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index 3d3749b..8768dc7 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -1,12 +1,14 @@ #!/bin/sh set -e +rootdir=$(pwd) distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -tar xf [% project %]-[% c('version') %].tar.bz2 -cd [% project %]-[% c('version') %] +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.bz2 +cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osx") -%] -cp ../lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.darwin10.h +cp $rootdir/lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.darwin10.h echo 'int main() {}' > src/gen-posix-lock-obj.c [% END -%] ./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] libotr: set SOURCE_DATE_EPOCH
commit a2f0773cc2111d3c77a7d4f1d1dbc552d3e39e14 Author: Nicolas Vigier Date: Fri Oct 16 01:08:28 2015 +0200 libotr: set SOURCE_DATE_EPOCH --- projects/libotr/build |1 + 1 file changed, 1 insertion(+) diff --git a/projects/libotr/build b/projects/libotr/build index 3aa8443..30ec46c 100755 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -14,6 +14,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf libotr-[% c('version') %].tar.gz cd /var/tmp/build/libotr-[% c('version') %] patch -p1 < $rootdir/bugs-otr-im-72.patch +export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) ./configure --prefix=$distdir [% c("var/configure_opt") %] make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %] make prefix=$distdir install ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] libgcrypt: build from a non-random directory
commit 5bc60f1b33248fd66d772f9608cea5a0415342ca Author: Nicolas Vigier Date: Thu Oct 15 19:36:25 2015 +0200 libgcrypt: build from a non-random directory --- projects/libgcrypt/build |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index 640c99e..9b9506f 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -6,11 +6,11 @@ mkdir -p /var/tmp/dist cd /var/tmp/dist tar xf $rootdir/[% c('input_files_by_name/libgpg-error') %] export PATH="/var/tmp/dist/libgpg-error/bin:$PATH" -cd $rootdir distdir=/var/tmp/dist/[% project %] mkdir -p $distdir -tar xf [% project %]-[% c('version') %].tar.bz2 -cd [% project %]-[% c('version') %] +mkdir /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.bz2 +cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osx") -%] # our compiler does not like -g sed -i 's/ac_cv_prog_cc_g=yes/ac_cv_prog_cc_g=no/' configure ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] libgpg-error: update to version 1.20
commit dab1bdda68c9bda3020e148d0ae9bebd07f793d7 Author: Nicolas Vigier Date: Thu Oct 15 17:30:23 2015 +0200 libgpg-error: update to version 1.20 --- projects/libgpg-error/config |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index 036ba8c..62978bf 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.16 +version: 1.20 remote_docker: 1 lsb_release: id: Ubuntu ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] binutils: add patch to define PE timestamps using SOURCE_DATE_EPOCH
commit 7209f00a2c3f4aa068da5c8bb5fc532611765d07 Author: Nicolas Vigier Date: Fri Oct 16 00:39:21 2015 +0200 binutils: add patch to define PE timestamps using SOURCE_DATE_EPOCH Patch from Debian: https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ SOURCE_DATE_EPOCH specification: https://reproducible-builds.org/specs/source-date-epoch/ --- projects/binutils/build |5 +- projects/binutils/config |5 +- projects/binutils/peXXigen.patch | 14 projects/binutils/specify-timestamp.patch | 123 + 4 files changed, 130 insertions(+), 17 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index 765c4c9..3531e89 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -8,8 +8,9 @@ cd [% project %]-[% c("version") %] sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch -# Zeroing timestamps in PE headers reliably, see bug 12753. -patch -p1 < ../peXXigen.patch +# specify-timestamp patch from Stephen Kitt +# https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ +patch -p2 < ../specify-timestamp.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] make -j4 diff --git a/projects/binutils/config b/projects/binutils/config index 7bd26f5..dee7ef0 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -29,5 +29,8 @@ input_files: - project: docker-image - filename: enable-reloc-section-ld.patch enable: '[% c("var/windows") %]' - - filename: peXXigen.patch + + # specify-timestamp patch from Stephen Kitt + # https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ + - filename: specify-timestamp.patch enable: '[% c("var/windows") %]' diff --git a/projects/binutils/peXXigen.patch b/projects/binutils/peXXigen.patch deleted file mode 100644 index f07dcf5..000 --- a/projects/binutils/peXXigen.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c -*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 -*** -*** 795,800 795,802 -/* Only use a real timestamp if the option was chosen. */ -if ((pe_data (abfd)->insert_timestamp)) - H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); -+ else -+ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); - -PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); diff --git a/projects/binutils/specify-timestamp.patch b/projects/binutils/specify-timestamp.patch new file mode 100644 index 000..37f4347 --- /dev/null +++ b/projects/binutils/specify-timestamp.patch @@ -0,0 +1,123 @@ +--- a/upstream/bfd/peXXigen.c b/upstream/bfd/peXXigen.c +@@ -66,6 +66,9 @@ + #include + #endif + ++#include ++#include ++ + /* NOTE: it's strange to be including an architecture specific header +in what's supposed to be general (to PE/PEI) code. However, that's +where the definitions are, and they don't vary per architecture +@@ -873,8 +876,36 @@ + H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns); + + /* Only use a real timestamp if the option was chosen. */ +- if ((pe_data (abfd)->insert_timestamp)) +-H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); ++ if (pe_data (abfd)->insert_timestamp) { ++time_t now; ++char *source_date_epoch; ++unsigned long long epoch; ++char *endptr; ++ ++now = time(NULL); ++source_date_epoch = getenv("SOURCE_DATE_EPOCH"); ++if (source_date_epoch) { ++ errno = 0; ++ epoch = strtoull(source_date_epoch, &endptr, 10); ++ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) ++|| (errno != 0 && epoch == 0)) { ++_bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", ++ strerror(errno)); ++ } else if (endptr == source_date_epoch) { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", ++ endptr); ++ } else if (*endptr != '\0') { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", ++ endptr); ++ } else if (epoch > ULONG_MAX) { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", ++ ULONG_MAX, epoch); ++ } else { ++ now = epoch; ++ } ++} ++H_PUT_32 (abfd, now, filehdr_out->f_timdat); ++ } + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr); +--- a/upstream/ld/pe-dll.c b/upstream/ld/pe-dll.c +@@ -26,6 +26,8 @@ +
[tor-commits] [tor-messenger-build/master] Update rbm for hg commit timestamp support
commit 8d6ab70d878cc121051dda1621fdb37ddc0ed806 Author: Nicolas Vigier Date: Fri Oct 16 14:57:39 2015 +0200 Update rbm for hg commit timestamp support --- rbm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index a8fafa3..9887d89 16 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit a8fafa3691de6ea722c60d882f84f26ed84a3c90 +Subproject commit 9887d891f57b1f45962693c97fb5cfa4aa26dbb0 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] libotr: build from a non-random directory
commit 8135de9a75ef132702b97839889ac77bd019c87b Author: Nicolas Vigier Date: Thu Oct 15 20:00:10 2015 +0200 libotr: build from a non-random directory --- projects/libotr/build |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/libotr/build b/projects/libotr/build index ecd94ee..3aa8443 100755 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -10,9 +10,10 @@ tar xf $rootdir/[% c('input_files_by_name/libgcrypt') %] export PATH="/var/tmp/dist/libgcrypt/bin:$PATH" cd $rootdir distdir=/var/tmp/dist/[% project %] -tar xf libotr-[% c('version') %].tar.gz -cd libotr-[% c('version') %] -patch -p1 < ../bugs-otr-im-72.patch +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf libotr-[% c('version') %].tar.gz +cd /var/tmp/build/libotr-[% c('version') %] +patch -p1 < $rootdir/bugs-otr-im-72.patch ./configure --prefix=$distdir [% c("var/configure_opt") %] make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %] make prefix=$distdir install ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 5af38b533e09d55b404c01d1847dafd7662a0267 Author: Translation commit bot Date: Fri Oct 16 15:15:04 2015 + Update translations for bridgedb --- te_IN/LC_MESSAGES/bridgedb.po | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/te_IN/LC_MESSAGES/bridgedb.po b/te_IN/LC_MESSAGES/bridgedb.po index aa6b8ec..aeb07eb 100644 --- a/te_IN/LC_MESSAGES/bridgedb.po +++ b/te_IN/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2015-10-16 14:43+\n" +"PO-Revision-Date: 2015-10-16 14:54+\n" "Last-Translator: decode_dev \n" "Language-Team: Telugu (India) (http://www.transifex.com/otf/torproject/language/te_IN/)\n" "MIME-Version: 1.0\n" @@ -48,19 +48,19 @@ msgstr "" #: bridgedb/https/templates/base.html:88 msgid "Contact" -msgstr "" +msgstr "à°¸à°à°ªà±à°°à°¦à°¿à°à°à°à°¡à°¿ " #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "" +msgstr "à° à°¨à±à°¨à°¿ à°à°à°à±à°à±à°à°¡à°¿" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "QRCode à°à±à°ªà°¿à°à°à°à°¡à°¿ " #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "మౠBridges à°²à±à°¨à±à°¸à± QRCode" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -73,7 +73,7 @@ msgstr "" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "మౠQRCode à°ªà±à°à°¦à°¡à°à°²à± à°²à±à°ªà° à°µà±à°à°¦à°¿" #: bridgedb/https/templates/bridges.html:73 msgid "" @@ -277,7 +277,7 @@ msgstr "నా Bridges పనిà°à±à°¯à°à±à°²à±à°¦à±! నాà°à± సహ #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "మౠTor పనిà°à±à°¯à°à°ªà±à°¤à± à°®à±à°°à± à°®à±à°¯à°¿à°²à± %s à°à±à°¯à°à°¡à°¿ " #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -291,19 +291,19 @@ msgstr "" #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "" +msgstr "à°à°¦à°¿à°à± మౠBridge à°°à±à°à°²à± " #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "" +msgstr "Bridges à°ªà±à°à°¦à°à°¡à°¿!" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Bridge à°°à°à° à°à±à°¸à° à°à°à°ªà°¿à°à°²à± à°à°à°à±à°à±à°à°¡à°¿:" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "à°®à±à°à± IPV6 à°à°¿à°°à±à°¨à°¾à°®à°¾à°²à± ఠవసరమా?" #: bridgedb/strings.py:135 #, python-format @@ -312,11 +312,11 @@ msgstr "" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "మౠబà±à°°à±à°à°°à± సరిà°à°¾ à°à°¿à°¤à±à°°à°¾à°²à± à°ªà±à°°à°¦à°°à±à°¶à°¿à°à°à°¡à° à°²à±à°¦à±." #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "à°ªà±à±à°¨ à°à°¿à°¤à±à°°à° à°¨à±à°à°¡à°¿ à° à°à±à°·à°°à°¾à°²à± à°à°à°à°°à± à°à±à°¯à°à°¦à°¿ ..." #: bridgedb/strings.py:144 msgid "How to start using your bridges" @@ -356,14 +356,14 @@ msgstr "" #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "" +msgstr "à° à°¸à°à°¦à±à°¶à°¾à°¨à±à°¨à°¿ à°ªà±à°°à°¦à°°à±à°¶à°¿à°¸à±à°¤à±à°à°¦à°¿." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "" +msgstr "వనిలà±à°²à°¾ Bridges à° à°à±à°¯à°°à±à°¥à°¨." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
commit b59aaa0511a3be43f5001cfe843851bd862e6876 Author: Translation commit bot Date: Fri Oct 16 14:46:20 2015 + Update translations for tor-messenger-authdtd --- te_IN/auth.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/te_IN/auth.dtd b/te_IN/auth.dtd index 8df5727..fb460dd 100644 --- a/te_IN/auth.dtd +++ b/te_IN/auth.dtd @@ -3,7 +3,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
commit 16310386823af8ed0c5b09217c2e2f7b5245 Author: Translation commit bot Date: Fri Oct 16 14:46:39 2015 + Update translations for tor-messenger-ircproperties --- te_IN/irc.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/te_IN/irc.properties b/te_IN/irc.properties index 3fd93d9..ac9910e 100644 --- a/te_IN/irc.properties +++ b/te_IN/irc.properties @@ -202,4 +202,4 @@ tooltip.serverValue=%1$S (%2$S) # LOCALIZATION NOTE (yes, no): # These are used to turn true/false values into a yes/no response. yes=Yes -no=No +no=à°à°¾à°¦à± ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit bd583661f2099ffae0daccd0ca957938c8f2b49f Author: Translation commit bot Date: Fri Oct 16 14:45:03 2015 + Update translations for bridgedb --- te_IN/LC_MESSAGES/bridgedb.po | 348 + 1 file changed, 175 insertions(+), 173 deletions(-) diff --git a/te_IN/LC_MESSAGES/bridgedb.po b/te_IN/LC_MESSAGES/bridgedb.po index cbac2a6..aa6b8ec 100644 --- a/te_IN/LC_MESSAGES/bridgedb.po +++ b/te_IN/LC_MESSAGES/bridgedb.po @@ -3,17 +3,19 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# decode_dev , 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+\n" -"PO-Revision-Date: 2015-04-19 08:23+\n" -"Last-Translator: runasand \n" -"Language-Team: Telugu (India) (http://www.transifex.com/projects/p/torproject/language/te_IN/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" +"POT-Creation-Date: 2015-07-25 03:40+\n" +"PO-Revision-Date: 2015-10-16 14:43+\n" +"Last-Translator: decode_dev \n" +"Language-Team: Telugu (India) (http://www.transifex.com/otf/torproject/language/te_IN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: te_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -28,57 +30,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." +msgstr "à°à±à°·à°®à°¿à°à°à°¾à°²à°¿! à°à°¦à± మౠఠà°à±à°¯à°°à±à°¥à°¨à°¨à± తపà±à°ªà± à°à°°à°¿à°à°¿à°à°¦à°¿." + +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "ఠసమాధానాలౠవà°à°¤à±à°¨ à°ªà°à°à±à°¤à±à°²à± à°à°¨à±à°¨à°¾à°¯à°¿. à°®à±à°¬à±à±à°²à± మరియౠà°à°¤à°° పరిà°à°°à°¾à°²à±à°²à± à°°à±à°¡à°°à± తౠసà±à°à°¾à°¨à± à°à±à°¸à°¿ à°à°¾à°ªà± à°à±à°¯à°à°¦à°¿ ." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤à° à° à°à°¦à±à°¬à°¾à°à±à°²à± à° à°µà°à°¤à±à°¨à°²à± à°²à±à°µà± ..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "బహà±à°¶à°¾ à°®à±à°°à± తిరిà°à°¿ à°µà±à°³à±à°²à°¿ %s à°µà±à°°à± à°µà°à°¤à±à°¨ à°°à°à° à°à°à°à±à°à±à°µà°¡à°¾à°¨à°¿à°à°¿ %s à°ªà±à°°à°¯à°¤à±à°¨à°¿à°à°à°¾à°²à°¿!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +
[tor-commits] [translation/tails-greeter] Update translations for tails-greeter
commit 9237d1889ef8151ddba836b5d6ba17c5191b6eec Author: Translation commit bot Date: Fri Oct 16 14:45:32 2015 + Update translations for tails-greeter --- te_IN/te_IN.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/te_IN/te_IN.po b/te_IN/te_IN.po index 9af260c..1618709 100644 --- a/te_IN/te_IN.po +++ b/te_IN/te_IN.po @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+\n" +"POT-Creation-Date: 2015-09-20 18:20+0200\n" +"PO-Revision-Date: 2015-10-16 14:37+\n" "Last-Translator: runasand \n" -"Language-Team: Telugu (India) (http://www.transifex.com/projects/p/torproject/language/te_IN/)\n" +"Language-Team: Telugu (India) (http://www.transifex.com/otf/torproject/language/te_IN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -43,7 +43,7 @@ msgstr "" #: ../glade/persistencewindow.glade.h:7 msgid "No" -msgstr "" +msgstr "à°à°¾à°¦à± " #: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" @@ -196,7 +196,7 @@ msgid "" "%(stderr)s" msgstr "" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 7e87e246875dca8183ff6b96a7a468edd83c07c1 Author: Translation commit bot Date: Fri Oct 16 14:45:21 2015 + Update translations for https_everywhere --- te_IN/ssl-observatory.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/te_IN/ssl-observatory.dtd b/te_IN/ssl-observatory.dtd index 69f1cfd..7f7bed8 100644 --- a/te_IN/ssl-observatory.dtd +++ b/te_IN/ssl-observatory.dtd @@ -1,7 +1,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
commit 3a20f269dda8b43a860e6d9a448bd7385dea717b Author: Translation commit bot Date: Fri Oct 16 14:45:47 2015 + Update translations for tor-launcher-network-settings --- te_IN/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/te_IN/network-settings.dtd b/te_IN/network-settings.dtd index 07d3d09..69e2232 100644 --- a/te_IN/network-settings.dtd +++ b/te_IN/network-settings.dtd @@ -5,7 +5,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-launcher/master] Bug 12967: Prompt for language during first run.
commit 919ccb92304fe86bda1d11ad6758871ccd483185 Author: Kathy Brade Date: Thu Oct 15 15:59:59 2015 -0400 Bug 12967: Prompt for language during first run. The intl.locale.matchOS pref is set to true by default so that the lanuage prompt is presented in the OS/system language. To skip the language prompt, set the TOR_SKIP_LOCALE_PROMPT env variable to 1 or set the hidden pref extensions.torlauncher.prompt_for_locale to false. --- src/chrome/content/localePicker.xul | 62 +++ src/chrome/content/network-settings.js| 158 ++--- src/chrome/locale/en/network-settings.dtd |4 + src/chrome/skin/network-settings.css |5 + src/components/tl-process.js | 59 --- src/defaults/preferences/prefs.js |4 + src/modules/tl-util.jsm | 20 7 files changed, 260 insertions(+), 52 deletions(-) diff --git a/src/chrome/content/localePicker.xul b/src/chrome/content/localePicker.xul new file mode 100644 index 000..be82e14 --- /dev/null +++ b/src/chrome/content/localePicker.xul @@ -0,0 +1,62 @@ + + + + + + + + + + +http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; +title="&torlauncher.localePicker.title;" +windowtype="TorLauncher:LocalePicker" +persist="screenX screenY" +onwizardfinish="return setLocale();" +onwizardcancel="return onCancel();" +onload="initLocaleDialog();"> + + + + + + + + + + + + &torlauncher.localePicker.prompt; + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index e4ebeaa..2382ea6 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -15,6 +15,10 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); +const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; +const kPrefLocale = "general.useragent.locale"; +const kPrefMatchOSLocale = "intl.locale.matchOS"; + const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; @@ -31,6 +35,7 @@ const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; const kWizardProxyRadioGroup = "proxyRadioGroup"; const kWizardUseBridgesRadioGroup = "useBridgesRadioGroup"; +const kLocaleList = "localeList"; const kUseProxyCheckbox = "useProxy"; const kProxyTypeMenulist = "proxyType"; const kProxyAddr = "proxyAddr"; @@ -58,29 +63,78 @@ const kTorConfKeyBridgeList = "Bridge"; var gProtocolSvc = null; var gTorProcessService = null; var gObsService = null; +var gHasQuitButton = false; var gIsInitialBootstrap = false; var gIsBootstrapComplete = false; var gRestoreAfterHelpPanelID = null; var gActiveTopics = []; // Topics for which an observer is currently installed. -function initDialog() +function initDialogCommon(aHasQuitButton) { - var isWindows = TorLauncherUtil.isWindows; + gHasQuitButton = aHasQuitButton; + + gObsService = Cc["@mozilla.org/observer-service;1"] + .getService(Ci.nsIObserverService); + + let isWindows = TorLauncherUtil.isWindows; if (isWindows) document.documentElement.setAttribute("class", "os-windows"); else if (TorLauncherUtil.isMac) document.documentElement.setAttribute("class", "os-mac"); - var forAssistance = document.getElementById("forAssistance"); + let forAssistance = document.getElementById("forAssistance"); if (forAssistance) { forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( "forAssistance", [kSupportAddr], 1); } - var cancelBtn = document.documentElement.getButton("cancel"); + if (aHasQuitButton) + { +let cancelBtn = document.documentElement.getButton("cancel"); +if (cancelBtn) +{ + let quitKey = isWindows ? "quit_win" : "quit"; + cancelBtn.label = TorLauncherUtil.getLocalizedString(quitKey); +} + } + + let wizardElem = getWizard(); + let haveWizard = (wizardElem != null); + if (haveWizard) + { +// Hide the Tor Browser logo and associated separator element if the +// TOR_HIDE_BROWSER_LOGO environment variable is set. +let env = Cc["@mozilla.org/process/environment;1"] +.getService(Ci.nsIEnvironment); +if (env.exists("TOR_HIDE_BROWSER_LOGO")) + wizardElem.setAttribute("tor_hide_browser_logo", true); + } +} + + +function resizeDialogToFitContent() +{ + // Resize this window to fit content. siz