May 2019 - tor-commits - lists.torproject.org

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 29 May '19

29 May '19

commit 5163802ae875e84ed6ab2c939d3510108576eeba Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 19:17:53 2019 +0000 Update translations for tbmanual-contentspot --- contents+fr.po | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 63149ebad..6902fbf82 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -917,8 +917,8 @@ msgid "" msgstr "" "Si vous avez essayé toutes ces actions et qu’aucune ne vous permet de vous " "connecter, vous devrez saisir manuellement des adresses de pont. Lisez la " -"section <a href=\"/bridges\">Les ponts</a> pour découvrir ce que sont les " -"ponts et comment en obtenir." +"section <a href=\"/fr/bridges\">Les ponts</a> pour découvrir ce que sont les" +" ponts et comment en obtenir." #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.title) @@ -1029,8 +1029,10 @@ msgstr "" "nœud de garde ne change qu’après 2 à 3 mois, contrairement aux autres nœuds " "qui changent pour chaque nouveau domaine. Pour plus de précisions sur les " "gardes, consultez la <a " -"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> et le <a " -"href=\"https://support.torproject.org/tbb/tbb-2/\">Portail d’assistance</a>." +"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> (site en " +"anglais) et le <a " +"href=\"https://support.torproject.org/fr/tbb/tbb-2/\">Portail " +"d’assistance</a>." #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1164,14 +1166,14 @@ msgid "" " reloaded. This option does not clear any private information or unlink your" " activity, nor does it affect your current connections to other websites." msgstr "" -"Cette option est utile si le <a href=\"/about-tor-browser#how-tor-" -"works\">relais de sortie</a> que vous utilisez n’arrive pas à se connecter " -"au site Web dont vous avez besoin ou ne le charge pas correctement. En la " -"sélectionnant, la fenêtre ou l’onglet actif sera rechargé sur un nouveau " -"circuit Tor. Les autres fenêtres et onglets ouverts du même site Web " -"utiliseront aussi le nouveau circuit quand ils seront rechargés. Cette " -"option n’efface aucun renseignement personnel, ni ne dissocie votre " -"activité, ni n’affectera vos connexions actuelles à d’autres sites Web." +"Cette option est utile si le <a href=\"/fr/about/#how-tor-works\">relais de " +"sortie</a> que vous utilisez n’arrive pas à se connecter au site Web dont " +"vous avez besoin ou ne le charge pas correctement. En la sélectionnant, la " +"fenêtre ou l’onglet actif sera rechargé sur un nouveau circuit Tor. Les " +"autres fenêtres et onglets ouverts du même site Web utiliseront aussi le " +"nouveau circuit quand ils seront rechargés. Cette option n’efface aucun " +"renseignement personnel, ni ne dissocie votre activité, ni n’affectera vos " +"connexions actuelles à d’autres sites Web." #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1228,8 +1230,8 @@ msgid "" " over HTTPS</a>." msgstr "" "* Tout le trafic entre les utilisateurs de Tor et les services onion est " -"chiffré de bout en bout, donc vous n’avez pas à vous soucier de vous <a href" -"=\"/secure-connections\">connecter par HTTPS</a>." +"chiffré de bout en bout, donc vous n’avez pas à vous soucier de vous <a " +"href=\"/fr/secure-connections\">connecter par HTTPS</a>." #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body)

1 0

[translation/tpo-web_completed] Update translations for tpo-web_completed
by translation＠torproject.org 29 May '19

29 May '19

commit d3ad47a2d274301ab09b707439512972456bff6c Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 18:50:29 2019 +0000 Update translations for tpo-web_completed --- contents+fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 5e6449a06..916fa0cb6 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -905,11 +905,11 @@ msgstr "" #: templates/hero-download-languages.html:2 #: templates/hero-download-options.html:2 msgid "DEFEND YOURSELF" -msgstr "" +msgstr "DÉFENDEZ-VOUS" #: templates/hero-download-tor.html:2 msgid "GROW THE NETWORK" -msgstr "" +msgstr "FAITES GRANDIR LE RÉSEAU" #: templates/hero-download.html:2 msgid "Defend yourself."

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 29 May '19

29 May '19

commit 06b35914c996d167abca3a649a5b8a3a062f6435 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 18:50:23 2019 +0000 Update translations for tpo-web --- contents+fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 5e6449a06..916fa0cb6 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -905,11 +905,11 @@ msgstr "" #: templates/hero-download-languages.html:2 #: templates/hero-download-options.html:2 msgid "DEFEND YOURSELF" -msgstr "" +msgstr "DÉFENDEZ-VOUS" #: templates/hero-download-tor.html:2 msgid "GROW THE NETWORK" -msgstr "" +msgstr "FAITES GRANDIR LE RÉSEAU" #: templates/hero-download.html:2 msgid "Defend yourself."

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 29 May '19

29 May '19

commit 7efefed13f8f995802914adab6412f4e6c628399 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 18:47:55 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+fr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 481a50495..63149ebad 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -128,7 +128,7 @@ msgid "" msgstr "" "Par défaut, le Navigateur Tor ne conserve aucun historique de navigation. " "Les témoins ne sont valides que pour une seule session (jusqu’à la fermeture" -" du Navigateur Tor ou si une <a href=\"/managing-identities/#new-" +" du Navigateur Tor ou si une <a href=\"/fr/managing-identities/#new-" "identity\">nouvelle identité</a> est demandée)." #: https//tb-manual.torproject.org/about/ @@ -368,8 +368,8 @@ msgstr "" "au réseau Tor sans autre configuration. Une fois que vous aurez cliqué, une " "barre d’état apparaîtra et affichera l’avancement de la connexion de Tor. Si" " votre connexion est plutôt rapide, mais que la barre d’état semble bloquée " -"à un certain niveau, la page <a href=\"/troubleshooting\">Dépannage</a> vous" -" aidera à régler le problème." +"à un certain niveau, la page <a href=\"/fr/troubleshooting\">Dépannage</a> " +"vous aidera à régler le problème." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -409,7 +409,7 @@ msgstr "" "». Si vous savez que votre connexion est censurée ou si vous avez tenté sans" " succès de vous connecter au réseau Tor et qu’aucune autre solution n’a " "fonctionné, sélectionnez « Oui ». L’écran <a " -"href=\"/circumvention\">Contournement</a> apparaîtra alors afin que vous " +"href=\"/fr/circumvention\">Contournement</a> apparaîtra alors afin que vous " "configuriez un transport enfichable." #: https//tb-manual.torproject.org/running-tor-browser/ @@ -462,7 +462,7 @@ msgid "" "combination with pluggable transports helps to disguise the fact that you " "are using Tor." msgstr "" -"La plupart des <a href=\"/transports\">transports enfichables</a>, tels " +"La plupart des <a href=\"/fr/transports\">transports enfichables</a>, tels " "qu’obfs3 et obfs4, comptent sur l’utilisation de relais-ponts. Comme les " "relais Tor ordinaires, les ponts sont exploités par des bénévoles ; " "cependant, contrairement aux relais ordinaires, ils ne sont pas répertoriés " @@ -826,8 +826,8 @@ msgstr "" "fournisseur d’accès à internet ou par un gouvernement. Le Navigateur Tor " "comprend des outils de contournement de ces blocages. On appelle ces outils " "des « transports enfichables ». Plus de précisions sur les types de " -"transports proposés actuellement se trouvent sur la page <a href=\"/en-" -"US/transports\">Transports enfichables</a>." +"transports proposés actuellement se trouvent sur la page <a " +"href=\"/fr/transports\">Transports enfichables</a>." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -1083,7 +1083,7 @@ msgid "" "* See the <a href=\"/secure-connections\">Secure Connections</a> page for " "important information on how to secure your connection when logging in." msgstr "" -"* Consultez la page <a href=\"/secure-connections\">Connexions " +"* Consultez la page <a href=\"/fr/secure-connections\">Connexions " "sécurisées</a> pour obtenir des renseignements importants sur la façon de " "sécuriser votre connexion lors d’une authentification."

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 29 May '19

29 May '19

commit 5c14310bacc5155e048f968e3e2e4f14741a6534 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 18:47:47 2019 +0000 Update translations for tbmanual-contentspot --- contents+fr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 481a50495..63149ebad 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -128,7 +128,7 @@ msgid "" msgstr "" "Par défaut, le Navigateur Tor ne conserve aucun historique de navigation. " "Les témoins ne sont valides que pour une seule session (jusqu’à la fermeture" -" du Navigateur Tor ou si une <a href=\"/managing-identities/#new-" +" du Navigateur Tor ou si une <a href=\"/fr/managing-identities/#new-" "identity\">nouvelle identité</a> est demandée)." #: https//tb-manual.torproject.org/about/ @@ -368,8 +368,8 @@ msgstr "" "au réseau Tor sans autre configuration. Une fois que vous aurez cliqué, une " "barre d’état apparaîtra et affichera l’avancement de la connexion de Tor. Si" " votre connexion est plutôt rapide, mais que la barre d’état semble bloquée " -"à un certain niveau, la page <a href=\"/troubleshooting\">Dépannage</a> vous" -" aidera à régler le problème." +"à un certain niveau, la page <a href=\"/fr/troubleshooting\">Dépannage</a> " +"vous aidera à régler le problème." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -409,7 +409,7 @@ msgstr "" "». Si vous savez que votre connexion est censurée ou si vous avez tenté sans" " succès de vous connecter au réseau Tor et qu’aucune autre solution n’a " "fonctionné, sélectionnez « Oui ». L’écran <a " -"href=\"/circumvention\">Contournement</a> apparaîtra alors afin que vous " +"href=\"/fr/circumvention\">Contournement</a> apparaîtra alors afin que vous " "configuriez un transport enfichable." #: https//tb-manual.torproject.org/running-tor-browser/ @@ -462,7 +462,7 @@ msgid "" "combination with pluggable transports helps to disguise the fact that you " "are using Tor." msgstr "" -"La plupart des <a href=\"/transports\">transports enfichables</a>, tels " +"La plupart des <a href=\"/fr/transports\">transports enfichables</a>, tels " "qu’obfs3 et obfs4, comptent sur l’utilisation de relais-ponts. Comme les " "relais Tor ordinaires, les ponts sont exploités par des bénévoles ; " "cependant, contrairement aux relais ordinaires, ils ne sont pas répertoriés " @@ -826,8 +826,8 @@ msgstr "" "fournisseur d’accès à internet ou par un gouvernement. Le Navigateur Tor " "comprend des outils de contournement de ces blocages. On appelle ces outils " "des « transports enfichables ». Plus de précisions sur les types de " -"transports proposés actuellement se trouvent sur la page <a href=\"/en-" -"US/transports\">Transports enfichables</a>." +"transports proposés actuellement se trouvent sur la page <a " +"href=\"/fr/transports\">Transports enfichables</a>." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -1083,7 +1083,7 @@ msgid "" "* See the <a href=\"/secure-connections\">Secure Connections</a> page for " "important information on how to secure your connection when logging in." msgstr "" -"* Consultez la page <a href=\"/secure-connections\">Connexions " +"* Consultez la page <a href=\"/fr/secure-connections\">Connexions " "sécurisées</a> pour obtenir des renseignements importants sur la façon de " "sécuriser votre connexion lors d’une authentification."

1 0

[tor-browser-build/master] Bug 30492: Switch to the OpenSSL 1.1.1 series
by boklm＠torproject.org 29 May '19

29 May '19

commit 2fba118f50c4bb3418787cdca5a021d5941841b6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 29 11:31:11 2019 +0000 Bug 30492: Switch to the OpenSSL 1.1.1 series --- projects/openssl/config | 4 ++-- projects/tor/build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index ecb6966..318529a 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2r +version: 1.1.1b filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6 + sha256sum: 5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b diff --git a/projects/tor/build b/projects/tor/build index a9305d6..8c8ed45 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -49,8 +49,8 @@ openssldir=/var/tmp/dist/openssl [% END -%] [% IF c("var/linux") %] mkdir -p "$distdir/Debug/Tor" - cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" - cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" + cp $openssldir/lib/libssl.so.1.1 "$distdir/Tor/" + cp $openssldir/lib/libcrypto.so.1.1 "$distdir/Tor/" cp $libeventdir/lib/libevent-2.1.so.6 "$distdir/Tor/" # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. # Copying it into /Browser, which feels more natural, and amending

1 0

[tor/master] updateCopyright: look at the current year.
by asn＠torproject.org 29 May '19

29 May '19

commit 66eb0a5a32e78e541f2b350fc814c35f17150859 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 20 12:02:20 2019 -0400 updateCopyright: look at the current year. --- scripts/maint/updateCopyright.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/maint/updateCopyright.pl b/scripts/maint/updateCopyright.pl index 36894b1ba..6800032f8 100755 --- a/scripts/maint/updateCopyright.pl +++ b/scripts/maint/updateCopyright.pl @@ -1,7 +1,9 @@ #!/usr/bin/perl -i -w -p -$NEWYEAR=2019; +@now = gmtime(); -s/Copyright(.*) (201[^9]), The Tor Project/Copyright$1 $2-${NEWYEAR}, The Tor Project/; +$NEWYEAR=$now[5]+1900; + +s/Copyright([^-]*) (20[^-]*), The Tor Project/Copyright$1 $2-${NEWYEAR}, The Tor Project/; s/Copyright(.*)-(20..), The Tor Project/Copyright$1-${NEWYEAR}, The Tor Project/;

1 0

[tor/master] rectify_include_paths: warn instead of aborting on duplicate headers
by asn＠torproject.org 29 May '19

29 May '19

commit 2f31c8146ff12aa96a33cce47bf4b5f5eeac8a06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 20 11:52:45 2019 -0400 rectify_include_paths: warn instead of aborting on duplicate headers We have two sendme.h files at the moment; we should fix that, but not in this branch. --- scripts/maint/add_c_file.py | 251 +++++++++++++++++++++++++++++++++ scripts/maint/rectify_include_paths.py | 13 +- 2 files changed, 262 insertions(+), 2 deletions(-) diff --git a/scripts/maint/add_c_file.py b/scripts/maint/add_c_file.py new file mode 100755 index 000000000..499415974 --- /dev/null +++ b/scripts/maint/add_c_file.py @@ -0,0 +1,251 @@ +#!/usr/bin/env python3 + +""" + Add a C file with matching header to the Tor codebase. Creates + both files from templates, and adds them to the right include.am file. + + Example usage: + + % add_c_file.py ./src/feature/dirauth/ocelot.c +""" + +import os +import re +import time + +def topdir_file(name): + """Strip opening "src" from a filename""" + if name.startswith("src/"): + name = name[4:] + return name + +def guard_macro(name): + """Return the guard macro that should be used for the header file 'name'. + """ + td = topdir_file(name).replace(".", "_").replace("/", "_").upper() + return "TOR_{}".format(td) + +def makeext(name, new_extension): + """Replace the extension for the file called 'name' with 'new_extension'. + """ + base = os.path.splitext(name)[0] + return base + "." + new_extension + +def instantiate_template(template, output_fname): + """ + Fill in a template with string using the fields that should be used + for 'output_fname'. + """ + names = { + # The relative location of the header file. + 'header_path' : makeext(topdir_file(output_fname), "h"), + # The relative location of the C file file. + 'c_file_path' : makeext(topdir_file(output_fname), "c"), + # The truncated name of the file. + 'short_name' : os.path.basename(output_fname), + # The current year, for the copyright notice + 'this_year' : time.localtime().tm_year, + # An appropriate guard macro, for the header. + 'guard_macro' : guard_macro(output_fname), + } + + return template.format(**names) + +HEADER_TEMPLATE = """\ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-{this_year}, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file {short_name} + * @brief Header for {c_file_path} + **/ + +#ifndef {guard_macro} +#define {guard_macro} + +#endif /* !defined({guard_macro}) */ +""" + +C_FILE_TEMPLATE = """\ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-{this_year}, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file {short_name} + * @brief DOCDOC + **/ + +#include "orconfig.h" +#include "{header_path}" +""" + +class AutomakeChunk: + """ + Represents part of an automake file. If it is decorated with + an ADD_C_FILE comment, it has a "kind" based on what to add to it. + Otherwise, it only has a bunch of lines in it. + """ + pat = re.compile(r'# ADD_C_FILE: INSERT (\S*) HERE', re.I) + + def __init__(self): + self.lines = [] + self.kind = "" + + def addLine(self, line): + """ + Insert a line into this chunk while parsing the automake file. + """ + m = self.pat.match(line) + if m: + if self.lines: + raise ValueError("control line not preceded by a blank line") + self.kind = m.group(1) + + self.lines.append(line) + if line.strip() == "": + return True + + return False + + def insertMember(self, member): + """ + Add a new member to this chunk. Try to insert it in alphabetical + order with matching indentation, but don't freak out too much if the + source isn't consistent. + + Assumes that this chunk is of the form: + FOOBAR = \ + X \ + Y \ + Z + """ + self.prespace = "\t" + self.postspace = "\t\t" + for lineno, line in enumerate(self.lines): + m = re.match(r'(\s+)(\S+)(\s+)\\', line) + if not m: + continue + prespace, fname, postspace = m.groups() + if fname > member: + self.insert_before(lineno, member, prespace, postspace) + return + self.insert_at_end(member) + + def insert_before(self, lineno, member, prespace, postspace): + self.lines.insert(lineno, + "{}{}{}\\\n".format(prespace, member, postspace)) + + def insert_at_end(self, member, prespace, postspace): + lastline = self.lines[-1] + self.lines[-1] += '{}\\\n'.format(postspace) + self.lines.append("{}{}\n".format(prespace, member)) + + def dump(self, f): + """Write all the lines in this chunk to the file 'f'.""" + for line in self.lines: + f.write(line) + if not line.endswith("\n"): + f.write("\n") + +class ParsedAutomake: + """A sort-of-parsed automake file, with identified chunks into which + headers and c files can be inserted. + """ + def __init__(self): + self.chunks = [] + self.by_type = {} + + def addChunk(self, chunk): + """Add a newly parsed AutomakeChunk to this file.""" + self.chunks.append(chunk) + self.by_type[chunk.kind.lower()] = chunk + + def add_file(self, fname, kind): + """Insert a file of kind 'kind' to the appropriate section of this + file. Return True if we added it. + """ + if kind.lower() in self.by_type: + self.by_type[kind.lower()].insertMember(fname) + return True + else: + return False + + def dump(self, f): + """Write this file into a file 'f'.""" + for chunk in self.chunks: + chunk.dump(f) + +def get_include_am_location(fname): + """Find the right include.am file for introducing a new file. Return None + if we can't guess one. + + Note that this function is imperfect because our include.am layout is + not (yet) consistent. + """ + td = topdir_file(fname) + m = re.match(r'^lib/([a-z0-9_]*)/', td) + if m: + return "src/lib/{}/include.am".format(m.group(1)) + + if re.match(r'^(core|feature|app)/', td): + return "src/core/include.am" + + if re.match(r'^test/', td): + return "src/test/include.am" + + return None + +def run(fn): + """ + Create a new C file and H file corresponding to the filename "fn", and + add them to include.am. + """ + + cf = makeext(fn, "c") + hf = makeext(fn, "h") + + if os.path.exists(cf): + print("{} already exists".format(cf)) + return 1 + if os.path.exists(hf): + print("{} already exists".format(hf)) + return 1 + + with open(cf, 'w') as f: + f.write(instantiate_template(C_FILE_TEMPLATE, cf)) + + with open(hf, 'w') as f: + f.write(instantiate_template(HEADER_TEMPLATE, hf)) + + iam = get_include_am_location(cf) + if iam is None or not os.path.exists(iam): + print("Made files successfully but couldn't identify include.am for {}" + .format(cf)) + return 1 + + amfile = ParsedAutomake() + cur_chunk = AutomakeChunk() + with open(iam) as f: + for line in f: + if cur_chunk.addLine(line): + amfile.addChunk(cur_chunk) + cur_chunk = AutomakeChunk() + amfile.addChunk(cur_chunk) + + amfile.add_file(cf, "sources") + amfile.add_file(hf, "headers") + + with open(iam+".tmp", 'w') as f: + amfile.dump(f) + + os.rename(iam+".tmp", iam) + +if __name__ == '__main__': + import sys + sys.exit(run(sys.argv[1])) diff --git a/scripts/maint/rectify_include_paths.py b/scripts/maint/rectify_include_paths.py index d1a2328ca..1140e8cd2 100755 --- a/scripts/maint/rectify_include_paths.py +++ b/scripts/maint/rectify_include_paths.py @@ -3,6 +3,10 @@ import os import os.path import re +import sys + +def warn(msg): + sys.stderr.write("WARNING: %s\n"%msg) # Find all the include files, map them to their real names. @@ -11,6 +15,8 @@ def exclude(paths, dirnames): if p in dirnames: dirnames.remove(p) +DUPLICATE = object() + def get_include_map(): includes = { } @@ -19,7 +25,10 @@ def get_include_map(): for fname in fnames: if fname.endswith(".h"): - assert fname not in includes + if fname in includes: + warn("Multiple headers named %s"%fname) + includes[fname] = DUPLICATE + continue include = os.path.join(dirpath, fname) assert include.startswith("src/") includes[fname] = include[4:] @@ -37,7 +46,7 @@ def fix_includes(inp, out, mapping): if m: include,hdr,rest = m.groups() basehdr = get_base_header_name(hdr) - if basehdr in mapping: + if basehdr in mapping and mapping[basehdr] is not DUPLICATE: out.write('{}{}{}\n'.format(include,mapping[basehdr],rest)) continue

1 0

[tor/master] Add a new "autostyle" make target to run all of our reformatting
by asn＠torproject.org 29 May '19

29 May '19

commit e2d3d444969abe2a2b802f4f42512b71a5a45468 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 20 12:08:30 2019 -0400 Add a new "autostyle" make target to run all of our reformatting Closes ticket 30539. --- Makefile.am | 31 ++++++++++++++++++++++++++----- changes/ticket30539 | 4 ++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 827cf3dc9..7a0d40d6a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -334,11 +334,8 @@ coverage-html-full: all lcov --remove "$(HTML_COVER_DIR)/lcov.tmp" --rc lcov_branch_coverage=1 'test/*' 'ext/tinytest*' '/usr/*' --output-file "$(HTML_COVER_DIR)/lcov.info" genhtml --branch-coverage -o "$(HTML_COVER_DIR)" "$(HTML_COVER_DIR)/lcov.info" -# Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c, -# tinytest*.[ch] -check-spaces: -if USE_PERL - $(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \ +# For scripts: avoid src/ext and src/trunnel. +OWNED_TOR_C_FILES=\ $(top_srcdir)/src/lib/*/*.[ch] \ $(top_srcdir)/src/core/*/*.[ch] \ $(top_srcdir)/src/feature/*/*.[ch] \ @@ -346,6 +343,11 @@ if USE_PERL $(top_srcdir)/src/test/*.[ch] \ $(top_srcdir)/src/test/*/*.[ch] \ $(top_srcdir)/src/tools/*.[ch] + +check-spaces: +if USE_PERL + $(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \ + $(OWNED_TOR_C_FILES) endif check-includes: @@ -456,6 +458,25 @@ version: (cd "$(top_srcdir)" && git rev-parse --short=16 HEAD); \ fi +.PHONY: autostyle-ifdefs +autostyle-ifdefs: + $(PYTHON) scripts/maint/annotate_ifdef_directives $(OWNED_TOR_C_FILES) + +.PHONY: autostyle-ifdefs +autostyle-operators: + $(PERL) scripts/coccinelle/test-operator-cleanup $(OWNED_TOR_C_FILES) + +.PHONY: rectify-includes +rectify-includes: + $(PYTHON) scripts/maint/rectify_include_paths.py + +.PHONY: update-copyright +update-copyright: + $(PERL) scripts/maint/updateCopyright.pl $(OWNED_TOR_C_FILES) + +.PHONY: autostyle +autostyle: update-versions rustfmt autostyle-ifdefs rectify-includes + mostlyclean-local: rm -f $(top_builddir)/src/*/*.gc{da,no} $(top_builddir)/src/*/*/*.gc{da,no} rm -rf $(HTML_COVER_DIR) diff --git a/changes/ticket30539 b/changes/ticket30539 new file mode 100644 index 000000000..8d105eacb --- /dev/null +++ b/changes/ticket30539 @@ -0,0 +1,4 @@ + o Minor features (maintenance): + - Add a new "make autostyle" target that developers can use to + apply all automatic Tor style and consistency conversions to the + codebase. Closes ticket 30539.

1 0

[tor/master] Merge branch 'tor-github/pr/1037'
by asn＠torproject.org 29 May '19

29 May '19

commit 70553a91343e242e05e569d59584674a21d09679 Merge: 650bdca97 e2d3d4449 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 29 21:25:32 2019 +0300 Merge branch 'tor-github/pr/1037' Makefile.am | 31 +++- changes/ticket30539 | 4 + scripts/maint/add_c_file.py | 251 +++++++++++++++++++++++++++++++++ scripts/maint/rectify_include_paths.py | 13 +- scripts/maint/updateCopyright.pl | 6 +- 5 files changed, 296 insertions(+), 9 deletions(-)

1 0