October 2014 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Use gecko-dev master branch
by boklm＠torproject.org 25 Oct '14

25 Oct '14

commit 08dbee58ab639b8e857e7cbc24a50c5bbf5a045c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Oct 25 17:46:03 2014 +0200 Use gecko-dev master branch --- projects/mozilla/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mozilla/config b/projects/mozilla/config index 1817b52..ebe0a09 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,6 +1,6 @@ version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/gecko-dev -git_hash: c4c00dbea8c410b82113c42f42e43971e4aa5d6c +git_hash: master src: | #!/bin/sh set -e

1 0

[torsocks/master] Fix: typo in the listen macro declaration
by dgoulet＠torproject.org 25 Oct '14

25 Oct '14

commit 579ad0f03c780469b74920b1f8cd7f5202c9f6cb Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Oct 24 13:01:06 2014 -0400 Fix: typo in the listen macro declaration "bind" name was used instead of "listen" in the extern declaration in torsock.h. This did not cause any issues since the full non extern declaration of the symbol was correctly defined in listen.c. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/torsocks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 9a99847..1a4219c 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -374,7 +374,7 @@ extern TSOCKS_LIBC_DECL(accept4, LIBC_ACCEPT4_RET_TYPE, LIBC_ACCEPT4_SIG) #endif /* listen(2) */ -extern TSOCKS_LIBC_DECL(bind, LIBC_LISTEN_RET_TYPE, LIBC_LISTEN_SIG) +extern TSOCKS_LIBC_DECL(listen, LIBC_LISTEN_RET_TYPE, LIBC_LISTEN_SIG) #define LIBC_LISTEN_DECL LIBC_LISTEN_RET_TYPE \ LIBC_LISTEN_NAME(LIBC_LISTEN_SIG)

1 0

[torsocks/master] Stop denying syscall() and add dangerous ones
by dgoulet＠torproject.org 25 Oct '14

25 Oct '14

commit f97b07ef921dbcaef8cb6718179bce21b4714e77 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Oct 24 13:12:14 2014 -0400 Stop denying syscall() and add dangerous ones This patch should support all dangerous syscall() that can leak to the network without going through the Tor network. With this, we can stop denying arbitrary syscalls through the syscall() function. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat.h | 15 ++++++++++++ src/lib/syscall.c | 68 +++++++++++++++++++++++++++++++++++++++++++++------ src/lib/torsocks.h | 3 +++ 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index f572563..766b1fd 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -75,6 +75,15 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #ifndef __NR_accept #define __NR_accept -6 #endif +#ifndef __NR_getpeername +#define __NR_getpeername -7 +#endif +#ifndef __NR_listen +#define __NR_listen -8 +#endif +#ifndef __NR_recvmsg +#define __NR_recvmsg -9 +#endif #define TSOCKS_NR_SOCKET __NR_socket #define TSOCKS_NR_CONNECT __NR_connect @@ -82,6 +91,9 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #define TSOCKS_NR_MMAP __NR_mmap #define TSOCKS_NR_MUNMAP __NR_munmap #define TSOCKS_NR_ACCEPT __NR_accept +#define TSOCKS_NR_GETPEERNAME __NR_getpeername +#define TSOCKS_NR_LISTEN __NR_listen +#define TSOCKS_NR_RECVMSG __NR_recvmsg #endif /* __linux__ */ @@ -100,6 +112,9 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #define TSOCKS_NR_MMAP SYS_mmap #define TSOCKS_NR_MUNMAP SYS_munmap #define TSOCKS_NR_ACCEPT SYS_accept +#define TSOCKS_NR_GETPEERNAME SYS_getpeername +#define TSOCKS_NR_LISTEN SYS_listen +#define TSOCKS_NR_RECVMSG SYS_recvmsg #endif /* __FreeBSD__, __FreeBSD_kernel__, __darwin__, __NetBSD__ */ diff --git a/src/lib/syscall.c b/src/lib/syscall.c index 9de6744..7b8d45a 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -121,6 +121,50 @@ static LIBC_SYSCALL_RET_TYPE handle_munmap(va_list args) } /* + * Handle getpeername(2) syscall. + */ +static LIBC_GETPEERNAME_RET_TYPE handle_getpeername(va_list args) +{ + int sockfd; + struct sockaddr *addr; + socklen_t *addrlen; + + sockfd = va_arg(args, __typeof__(sockfd)); + addr = va_arg(args, __typeof__(addr)); + addrlen = va_arg(args, __typeof__(addrlen)); + + return tsocks_getpeername(sockfd, addr, addrlen); +} + +/* + * Handle listen(2) syscall. + */ +static LIBC_LISTEN_RET_TYPE handle_listen(va_list args) +{ + int sockfd, backlog; + + sockfd = va_arg(args, __typeof__(sockfd)); + backlog = va_arg(args, __typeof__(backlog)); + + return tsocks_listen(sockfd, backlog); +} + +/* + * Handle recvmsg(2) syscall. + */ +static LIBC_RECVMSG_RET_TYPE handle_recvmsg(va_list args) +{ + int sockfd, flags; + struct msghdr *msg; + + sockfd = va_arg(args, __typeof__(sockfd)); + msg = va_arg(args, __typeof__(msg)); + flags = va_arg(args, __typeof__(flags)); + + return tsocks_recvmsg(sockfd, msg, flags); +} + +/* * Torsocks call for syscall(2) */ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args) @@ -175,15 +219,18 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args) case TSOCKS_NR_ACCEPT: ret = handle_accept(args); break; + case TSOCKS_NR_GETPEERNAME: + ret = handle_getpeername(args); + break; + case TSOCKS_NR_LISTEN: + ret = handle_listen(args); + break; + case TSOCKS_NR_RECVMSG: + ret = handle_recvmsg(args); + break; default: - /* - * Deny call since we have no idea if this call can leak or not data - * off the Tor network. - */ - WARN("[syscall] Unsupported syscall number %ld. Denying the call", - number); - ret = -1; - errno = ENOSYS; + /* Safe to call the libc syscall function. */ + ret = tsocks_libc_syscall(number, args); break; } @@ -198,6 +245,11 @@ LIBC_SYSCALL_DECL LIBC_SYSCALL_RET_TYPE ret; va_list args; + if (!tsocks_libc_syscall) { + tsocks_libc_syscall= tsocks_find_libc_symbol( + LIBC_SYSCALL_NAME_STR, TSOCKS_SYM_EXIT_NOT_FOUND); + } + va_start(args, number); ret = tsocks_syscall(number, args); va_end(args); diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 1a4219c..6ded557 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -273,6 +273,7 @@ TSOCKS_DECL(connect, LIBC_CONNECT_RET_TYPE, LIBC_CONNECT_SIG) /* recvmsg(2) */ extern TSOCKS_LIBC_DECL(recvmsg, LIBC_RECVMSG_RET_TYPE, LIBC_RECVMSG_SIG) +TSOCKS_DECL(recvmsg, LIBC_RECVMSG_RET_TYPE, LIBC_RECVMSG_SIG) #define LIBC_RECVMSG_DECL \ LIBC_RECVMSG_RET_TYPE LIBC_RECVMSG_NAME(LIBC_RECVMSG_SIG) @@ -357,6 +358,7 @@ extern TSOCKS_LIBC_DECL(getaddrinfo, LIBC_GETADDRINFO_RET_TYPE, /* getpeername(2) */ extern TSOCKS_LIBC_DECL(getpeername, LIBC_GETPEERNAME_RET_TYPE, LIBC_GETPEERNAME_SIG) +TSOCKS_DECL(getpeername, LIBC_GETPEERNAME_RET_TYPE, LIBC_GETPEERNAME_SIG) #define LIBC_GETPEERNAME_DECL LIBC_GETPEERNAME_RET_TYPE \ LIBC_GETPEERNAME_NAME(LIBC_GETPEERNAME_SIG) @@ -375,6 +377,7 @@ extern TSOCKS_LIBC_DECL(accept4, LIBC_ACCEPT4_RET_TYPE, LIBC_ACCEPT4_SIG) /* listen(2) */ extern TSOCKS_LIBC_DECL(listen, LIBC_LISTEN_RET_TYPE, LIBC_LISTEN_SIG) +TSOCKS_DECL(listen, LIBC_LISTEN_RET_TYPE, LIBC_LISTEN_SIG) #define LIBC_LISTEN_DECL LIBC_LISTEN_RET_TYPE \ LIBC_LISTEN_NAME(LIBC_LISTEN_SIG)

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 25 Oct '14

25 Oct '14

commit 0c8cf4717d612d7369300b2992ea98060d84c36d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 25 13:45:20 2014 +0000 Update translations for liveusb-creator --- sr/sr.po | 59 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/sr/sr.po b/sr/sr.po index 5f3ad42..f1e62be 100644 --- a/sr/sr.po +++ b/sr/sr.po @@ -4,15 +4,16 @@ # # Translators: # Igor Miletic <grejigl-gnomeprevod(a)yahoo.ca>, 2008 +# Ivan Radeljic <radeljicivan85(a)gmail.com>, 2014 # Milos, 2013 # Небојша Јаковљевић <nebojsa(a)nebjak.net>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-01 22:11+0200\n" -"PO-Revision-Date: 2014-07-02 08:55+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2014-10-25 13:31+0000\n" +"Last-Translator: Ivan Radeljic <radeljicivan85(a)gmail.com>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,10 +41,10 @@ msgstr "" msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "" -#: ../liveusb/creator.py:1047 +#: ../liveusb/creator.py:1059 #, python-format msgid "%s already bootable" -msgstr "" +msgstr "%s већ bootable" #: ../liveusb/launcher_ui.py:156 msgid "" @@ -52,7 +53,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Треба ли вам помоћ? Прочитајте </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">документацију</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:151 msgid "" @@ -61,7 +62,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Копирај покренут Tails на USB стик или на SD картицу. Сви подаци на том медијуму биће уништени.</span></p></body></html>" #: ../liveusb/launcher_ui.py:153 msgid "" @@ -97,12 +98,12 @@ msgid "" "persist after a reboot." msgstr "" -#: ../liveusb/creator.py:1146 ../liveusb/creator.py:1409 +#: ../liveusb/creator.py:1158 ../liveusb/creator.py:1421 #, python-format msgid "Calculating the SHA1 of %s" msgstr "" -#: ../liveusb/creator.py:1357 +#: ../liveusb/creator.py:1369 msgid "Cannot find" msgstr "Ne mogu da nadjem" @@ -153,7 +154,7 @@ msgstr "Preuzmianje neuspelo!" msgid "Downloading %s..." msgstr "Preuzmimam %s..." -#: ../liveusb/creator.py:1142 +#: ../liveusb/creator.py:1154 msgid "Drive is a loopback, skipping MBR reset" msgstr "" @@ -162,7 +163,7 @@ msgstr "" msgid "Entering unmount_device for '%(device)s'" msgstr "" -#: ../liveusb/creator.py:1222 +#: ../liveusb/creator.py:1234 msgid "Error probing device" msgstr "" @@ -182,7 +183,7 @@ msgstr "Greska: SHA1 vaseg Live CD je nevazeci . Mozete da pokrenete ovaj progra msgid "Extracting live image to the target device..." msgstr "" -#: ../liveusb/creator.py:1090 +#: ../liveusb/creator.py:1102 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formatiram %(device)s kao FAT32" @@ -218,7 +219,7 @@ msgstr "Instalacija zavrsena! (%s)" msgid "Installation was completed. Press OK to close this program." msgstr "Instalacija je zavrsena. Kliknite OK da zatvorite program." -#: ../liveusb/creator.py:947 ../liveusb/creator.py:1263 +#: ../liveusb/creator.py:959 ../liveusb/creator.py:1275 msgid "Installing bootloader..." msgstr "" @@ -226,13 +227,13 @@ msgstr "" msgid "LiveUSB creation failed!" msgstr "Kreiranje LiveUSB-a nije uspelo!" -#: ../liveusb/creator.py:1358 +#: ../liveusb/creator.py:1370 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "" -#: ../liveusb/creator.py:1234 +#: ../liveusb/creator.py:1246 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Pobrinite se da je vas USB uredjaj utaknut i formatiran sa FAT sistemom." @@ -288,7 +289,7 @@ msgstr "" msgid "Releases updated!" msgstr "" -#: ../liveusb/creator.py:954 ../liveusb/creator.py:1281 +#: ../liveusb/creator.py:966 ../liveusb/creator.py:1293 #, python-format msgid "Removing %(file)s" msgstr "Brisem %(file)s" @@ -297,7 +298,7 @@ msgstr "Brisem %(file)s" msgid "Removing existing Live OS" msgstr "" -#: ../liveusb/creator.py:1136 +#: ../liveusb/creator.py:1148 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "" @@ -322,7 +323,7 @@ msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Vrsta izvora ne podrzava verifickaciju ISO MD5 checksum, preskacem" -#: ../liveusb/creator.py:1170 +#: ../liveusb/creator.py:1182 msgid "Synchronizing data on disk..." msgstr "" @@ -374,11 +375,11 @@ msgstr "" msgid "This is the status console, where all messages get written to." msgstr "Ovo je statusna konzola, gde se sve poruke ispisuju." -#: ../liveusb/creator.py:910 +#: ../liveusb/creator.py:922 msgid "Trying to continue anyway." msgstr "" -#: ../liveusb/creator.py:942 +#: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "" @@ -397,15 +398,15 @@ msgstr "" msgid "Unable to find any USB drive" msgstr "Nijedan USB uredjaj nije pronadjen." -#: ../liveusb/creator.py:1224 +#: ../liveusb/creator.py:1236 msgid "Unable to find any supported device" msgstr "" -#: ../liveusb/creator.py:1067 +#: ../liveusb/creator.py:1079 msgid "Unable to find partition" msgstr "Ne moguce pronaci particiju." -#: ../liveusb/creator.py:1304 +#: ../liveusb/creator.py:1316 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "" @@ -429,7 +430,7 @@ msgstr "" msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "" -#: ../liveusb/creator.py:1139 +#: ../liveusb/creator.py:1151 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "" @@ -454,7 +455,7 @@ msgstr "Nepoznat ISO, preskacem checksum verifikaciju" msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "" -#: ../liveusb/creator.py:779 ../liveusb/creator.py:921 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:933 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "" @@ -473,12 +474,12 @@ msgstr "" msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "" -#: ../liveusb/creator.py:907 +#: ../liveusb/creator.py:919 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "" -#: ../liveusb/creator.py:784 ../liveusb/creator.py:924 +#: ../liveusb/creator.py:784 ../liveusb/creator.py:936 #, python-format msgid "Unsupported filesystem: %s" msgstr "Filesystem nepodrzan: %s" @@ -490,7 +491,7 @@ msgid "" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Filesystem nije podrzan: %s\nU slucaju da pokusavate da nadogradite rucno instaliran Tails sistem (znaci, ukoliko niste koristili installer), ova opcije nije podrzana: morate instalirati ponovo, npr. tako sto cete izabrati \"Kloniraj & Instaliraj\" opciju." -#: ../liveusb/creator.py:1237 +#: ../liveusb/creator.py:1249 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -522,7 +523,7 @@ msgstr "" msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "" -#: ../liveusb/creator.py:918 ../liveusb/creator.py:1230 +#: ../liveusb/creator.py:930 ../liveusb/creator.py:1242 msgid "Verifying filesystem..." msgstr "Filesystem verifikacija..."

1 0

[torbirdy/master] remove dump()
by sukhbir＠torproject.org 25 Oct '14

25 Oct '14

commit 44ea30351bcbcccc96a91505c77fd0e7141e35e0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 23 14:06:29 2014 +0000 remove dump() --- components/torbirdy.js | 1 - 1 file changed, 1 deletion(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 71d250e..40adadb 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -413,7 +413,6 @@ TorBirdy.prototype = { }, setPrefs: function() { - dump("Setting TorBirdy preferences\n"); // If custom values are set for specific preferences, override the defaults with them. // For each preference, get the type and then set the property. for (var i = 0; i < this.customPrefs.length; i++) {

1 0

[torbirdy/master] switch to new GnuPG key
by sukhbir＠torproject.org 25 Oct '14

25 Oct '14

commit afa1e7d019d5765458feba9a2d21bab55beb461a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 23 14:16:26 2014 +0000 switch to new GnuPG key --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 078535c..414dff0 100644 --- a/Makefile +++ b/Makefile @@ -8,14 +8,14 @@ clean: rm -f ../torbirdy-$(VERSION).xpi git-tag: - git tag -u 0xD81D840E -s $(VERSION) + git tag -u 0xD255D3F5C868227F -s $(VERSION) git-push: git push --tags git push sign-release: - gpg -u 0xD81D840E -abs ../torbirdy-${VERSION}.xpi$ + gpg -u 0xD255D3F5C868227F -abs ../torbirdy-${VERSION}.xpi$ sha1sum ../torbirdy-${VERSION}.xpi$ push-release:

1 0

[torbirdy/master] Update website push details
by sukhbir＠torproject.org 25 Oct '14

25 Oct '14

commit 1ec029f3f7e6b3892e3b6de9d5dde0af9f2d7b1d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 23 14:55:13 2014 +0000 Update website push details --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5b1fe94..96214b1 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,10 @@ sign-release: sha1sum ../torbirdy-${VERSION}.xpi$ push-release: - chmod 664 ../torbirdy-${VERSION}.xpi*$ - scp ../torbirdy-${VERSION}.xpi* vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/$ - scp ../torbirdy-${VERSION}.xpi vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/t… - scp ../torbirdy-${VERSION}.xpi.asc vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/t… - ssh vescum.torproject.org ~mirroradm/bin/trigger-mirrors + chmod 664 ../torbirdy-${VERSION}.xpi* + scp ../torbirdy-${VERSION}.xpi* staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbirdy/ + scp ../torbirdy-${VERSION}.xpi staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbirdy… + scp ../torbirdy-${VERSION}.xpi.asc staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbirdy… + ssh staticiforme.torproject.org static-update-component dist.torproject.org release: sign-release push-release

1 0

[torbirdy/master] Add README.RELEASE instructions
by sukhbir＠torproject.org 25 Oct '14

25 Oct '14

commit 714252d242dc967204215063ec300fcf24886890 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Oct 23 14:30:06 2014 +0000 Add README.RELEASE instructions --- Makefile | 2 +- README.RELEASE | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 414dff0..5b1fe94 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL := /bin/bash VERSION := $(shell cat install.rdf|grep '<em:version>'|cut -d\> -f2|cut -d\< -f1) make-xpi: - zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" + zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" clean: rm -f ../torbirdy-$(VERSION).xpi diff --git a/README.RELEASE b/README.RELEASE new file mode 100644 index 0000000..f398409 --- /dev/null +++ b/README.RELEASE @@ -0,0 +1,20 @@ +To perform a release for TorBirdy: + + Perform substantial development effort or patch security issues + Review all changes with at least one other person + Update ChangeLog to refelect all changes and add a release date + Run `make` and test the resulting xpi + Confirm that there are no issues with normal use on The Big Three platforms + Confirm that the error console does not have any errors related to TorBirdy + Tag, sign and push the signatures to git: + Run `make git-tag` and sign a tag for this release + Run `make git-push` and push the tag upstream + Make detached signature for non-git users: + Run `make sign-release` and sign the .xpi file + Upload packages to the Tor Project webserver: + Run `push-release` and the packages are uploaded + Upload the package to Mozilla's AddOn site manually + Write a blog post anouncing the release on the Tor Project blog + Write an email anouncing the release to tor-talk + Announce the release widely in whatever format is reasonable or desired +

1 0

[tor-browser-bundle/master] Pick up new #13091 fix.
by mikeperry＠torproject.org 25 Oct '14

25 Oct '14

commit 2fd4c60edcd6946728f62072f20f88a4eaf9ad50 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Oct 25 01:07:28 2014 -0700 Pick up new #13091 fix. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index fe53b58..b99e049 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,6 +6,7 @@ Tor Browser 4.0.1 -- Oct 30 2014 * Bug 13460: Fix MSVC compilation issue * Windows * Bug 13443: Disable DirectShow to prevent crashes on many sites + * Bug 13091: Make app name "Tor Browser" instead of "Tor" Tor Browser 4.0 -- Oct 15 2014 * All Platforms diff --git a/gitian/versions b/gitian/versions index 8d8c4c9..30222f7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,7 +8,7 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build3 TOR_TAG=tor-0.2.5.10 TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.7.0.1

1 0

[tor-browser/tor-browser-31.2.0esr-4.x-1] fixup! Bug 13091: include spaces in Win resources.
by mikeperry＠torproject.org 25 Oct '14

25 Oct '14

commit 26735f870de9ec7cb7b9e6aa5bbf4fd9f92ea4fd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Oct 24 14:07:03 2014 -0400 fixup! Bug 13091: include spaces in Win resources. Our app display name, "Tor Browser", was truncated to "Tor" within Windows resources (FileDescription, InternalName, and ProductName fields). Fixed by adding quotes around parameters passed to the version_win.pl program. --- config/version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/version.mk b/config/version.mk index 414a1eb..219ac60 100644 --- a/config/version.mk +++ b/config/version.mk @@ -15,7 +15,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifndef RESFILE RCFILE=./module.rc RESFILE=./module.res -_RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(topsrcdir) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION $(MOZ_APP_VERSION) +_RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(topsrcdir) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME "$(MOZ_APP_DISPLAYNAME)" -APPVERSION "$(MOZ_APP_VERSION)" ifdef MOZILLA_OFFICIAL _RC_STRING += -OFFICIAL 1 endif

1 0