August 2020 - tor-commits - lists.torproject.org

[tor/master] Attempt to fix test_include.py on TravisCI #25140
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit 60c436d14d05dcc5e03058a16373c53ff94469c5 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Wed Aug 12 14:35:51 2020 +0100 Attempt to fix test_include.py on TravisCI #25140 --- src/test/test_include.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_include.py b/src/test/test_include.py index 0ac87ee8fb..ec261da86c 100644 --- a/src/test/test_include.py +++ b/src/test/test_include.py @@ -127,7 +127,7 @@ tor_process = subprocess.Popen([tor_path, if tor_process == None: fail('ERROR: running tor failed') -wait_for_log('Opened Control listener on') +wait_for_log('Opened Control listener') control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) if control_socket.connect_ex(('127.0.0.1', control_port)):

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/62'
by nickm＠torproject.org 12 Aug '20

12 Aug '20

1 0

[tor/master] Use correct type for gl_closedir to avoid a compiler warning
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit 9ef991dbe37b18c1d3af4a5a4d0b674d3f18cc5f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 14:42:30 2020 -0400 Use correct type for gl_closedir to avoid a compiler warning --- src/lib/fs/path.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index 1a60ca70d4..f03cecf52d 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -553,6 +553,12 @@ prot_lstat(const char *pathname, struct stat *buf) { return lstat(sandbox_intern_string(pathname), buf); } +/** As closedir, but has the right type for gl_closedir */ +static void +wrap_closedir(void *arg) +{ + closedir(arg); +} #endif /* defined(_WIN32) */ /** Return a new list containing the paths that match the pattern @@ -580,7 +586,7 @@ tor_glob(const char *pattern) typedef void (*gl_closedir)(void *); matches.gl_opendir = (gl_opendir) &prot_opendir; matches.gl_readdir = (gl_readdir) &readdir; - matches.gl_closedir = (gl_closedir) &closedir; + matches.gl_closedir = (gl_closedir) &wrap_closedir; matches.gl_stat = &prot_stat; matches.gl_lstat = &prot_lstat; #endif /* defined(GLOB_ALTDIRFUNC) */

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 12 Aug '20

12 Aug '20

commit 7de0296a7e027e933e3d24c7d2d456b23cf56fbd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 18:18:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index d943438f02..d829b7fa39 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -8673,6 +8673,8 @@ msgid "" "Relays and bridges report some of the data in 24-hour intervals which may " "end at any time of the day." msgstr "" +"تقوم المرحلات والجسور بالإبلاغ عن بعض البيانات في فترات 24 ساعة والتي قد " +"تنتهي في أي وقت من اليوم." #: https//support.torproject.org/metrics/graphs/ #: (content/metrics/graphs/contents+en.lrquestion.description) @@ -8680,6 +8682,8 @@ msgid "" "And after such an interval is over relays and bridges might take another 18 " "hours to report the data." msgstr "" +"وبعد انتهاء هذا الفاصل الزمني ، قد تستغرق الجسور 18 ساعة أخرى للإبلاغ عن " +"البيانات." #: https//support.torproject.org/metrics/graphs/ #: (content/metrics/graphs/contents+en.lrquestion.description) @@ -8688,13 +8692,16 @@ msgid "" "the last data point in a graph indicates a recent trend change which is in " "fact just an artifact of the algorithm." msgstr "" +"لقد قطعنا الرسوم البيانية في اليومين الأخيرين ، لأننا نريد تجنب أن تشير آخر " +"نقطة بيانات في الرسم البياني إلى تغيير حديث في الاتجاه وهو في الواقع مجرد " +"قطعة أثرية للخوارزمية." #: https//support.torproject.org/metrics/methodology/ #: (content/metrics/methodology/contents+en.lrquestion.title) msgid "" "Why do you believe the current approach to estimate user numbers is more " "accurate?" -msgstr "" +msgstr "لماذا تعتقد أن النهج الحالي لتقدير أعداد المستخدمين أكثر دقة؟" #: https//support.torproject.org/metrics/methodology/ #: (content/metrics/methodology/contents+en.lrquestion.description) @@ -8702,6 +8709,8 @@ msgid "" "For direct users, we include all directories which we didn't do in the old " "approach." msgstr "" +"بالنسبة للمستخدمين المباشرين ، نقوم بتضمين جميع الأدلة التي لم نقم بها في " +"الطريقة القديمة." #: https//support.torproject.org/metrics/methodology/ #: (content/metrics/methodology/contents+en.lrquestion.description) @@ -8709,6 +8718,8 @@ msgid "" "We also use histories that only contain bytes written to answer directory " "requests, which is more precise than using general byte histories." msgstr "" +"نستخدم أيضًا سجلات تحتوي على وحدات بايت فقط مكتوبة للإجابة على طلبات الدليل " +"، وهو أكثر دقة من استخدام سجلات البايت العامة." #: https//support.torproject.org/metrics/stats-report/ #: (content/metrics/stats-report/contents+en.lrquestion.title) @@ -8716,6 +8727,8 @@ msgid "" "Are there more fine-grained numbers available, for example, on the number of" " users per hour?" msgstr "" +"هل هناك المزيد من الأرقام الدقيقة المتاحة ، على سبيل المثال ، حول عدد " +"المستخدمين في الساعة؟" #: https//support.torproject.org/metrics/stats-report/ #: (content/metrics/stats-report/contents+en.lrquestion.description) @@ -8723,6 +8736,8 @@ msgid "" "No, the relays that report these statistics aggregate requests by country of" " origin and over a period of 24 hours." msgstr "" +"لا ، المرحلات التي تُبلغ عن هذه الإحصائيات تجمع الطلبات حسب بلد المنشأ وعلى " +"مدار 24 ساعة." #: https//support.torproject.org/metrics/stats-report/ #: (content/metrics/stats-report/contents+en.lrquestion.description) @@ -8730,11 +8745,13 @@ msgid "" "The statistics we would need to gather for the number of users per hour " "would be too detailed and might put users at risk." msgstr "" +"ستكون الإحصاءات التي سنحتاج إلى جمعها لعدد المستخدمين في الساعة مفصلة للغاية" +" وقد تعرض المستخدمين للخطر." #: https//support.torproject.org/metrics/user-estimation/ #: (content/metrics/user-estimation/contents+en.lrquestion.title) msgid "How is it even possible to count users in an anonymity network?" -msgstr "" +msgstr "كيف يمكن حتى عد المستخدمين في شبكة المجهولية؟" #: https//support.torproject.org/metrics/user-estimation/ #: (content/metrics/user-estimation/contents+en.lrquestion.description) @@ -8743,11 +8760,14 @@ msgid "" " clients make periodically to update their list of relays and estimate user " "numbers indirectly from there." msgstr "" +"نحن في الواقع لا نحسب المستخدمين ، لكننا نحسب الطلبات إلى الدلائل التي يقوم " +"بها العملاء بشكل دوري لتحديث قائمة المرحلات الخاصة بهم وتقدير أعداد " +"المستخدمين بشكل غير مباشر من هناك." #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.title) msgid "How do you get from these directory requests to user numbers?" -msgstr "" +msgstr "كيف تنتقل من طلبات الدليل هذه إلى أرقام المستخدمين؟" #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.description) @@ -8757,13 +8777,17 @@ msgid "" "but not all clients are connected 24/7, so we picked the number 10 for the " "average client." msgstr "" +"لقد افترضنا أن العميل العادي يقدم 10 من هذه الطلبات يوميًا. يقدم عميل tor " +"المتصل على مدار الساعة طوال أيام الأسبوع حوالي 15 طلبًا في اليوم ، ولكن ليس " +"كل العملاء متصلون على مدار الساعة طوال أيام الأسبوع ، لذلك اخترنا الرقم 10 " +"للعميل العادي." #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.description) msgid "" "We simply divide directory requests by 10 and consider the result as the " "number of users." -msgstr "" +msgstr "نحن ببساطة نقسم طلبات الدليل على 10 ونعتبر النتيجة هي عدد المستخدمين." #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.description) @@ -8772,6 +8796,8 @@ msgid "" " a client that stays online for one tenth of a day, so 2 hours and 24 " "minutes." msgstr "" +"هناك طريقة أخرى للنظر في الأمر ، وهي أننا نفترض أن كل طلب يمثل عميلاً يبقى " +"متصلاً بالإنترنت لمدة عُشر اليوم ، أي ساعتان و 24 دقيقة." #: https//support.torproject.org/metrics/users-or-clients/ #: (content/metrics/user-or-clients/contents+en.lrquestion.title) @@ -8779,6 +8805,7 @@ msgid "" "Are these tor clients or users? What if there's more than one user behind a" " tor client?" msgstr "" +"هل هؤلاء عملاء أو مستخدمين؟ ماذا لو كان هناك أكثر من مستخدم وراء عميل Tor؟" #: https//support.torproject.org/metrics/users-or-clients/ #: (content/metrics/user-or-clients/contents+en.lrquestion.description) @@ -8787,6 +8814,8 @@ msgid "" "intuitive for most people to think of users, that's why we say users and not" " clients." msgstr "" +"ثم نعتبر هؤلاء المستخدمين واحدًا. نحن نحسب العملاء حقًا ، لكن من البديهي أن " +"يفكر معظم الناس في المستخدمين ، ولهذا السبب نقول المستخدمين وليس العملاء." #: https//support.torproject.org/metrics/user-overcount/ #: (content/metrics/user-overcount/contents+en.lrquestion.title) @@ -8794,6 +8823,8 @@ msgid "" "What if a user runs tor on a laptop and changes their IP address a few times" " per day? Don't you overcount that user?" msgstr "" +"ماذا لو قام المستخدم بتشغيل جهاز كمبيوتر محمول وتغيير عنوان IP الخاص به عدة " +"مرات في اليوم؟ ألا تفرط في حساب هذا المستخدم؟" #: https//support.torproject.org/metrics/user-overcount/ #: (content/metrics/user-overcount/contents+en.lrquestion.description) @@ -8801,6 +8832,8 @@ msgid "" "No, because that user updates their list of relays as often as a user that " "doesn't change IP address over the day." msgstr "" +"لا ، لأن هذا المستخدم يقوم بتحديث قائمة المرحلات الخاصة به كثيرًا مثل مستخدم" +" لا يغير عنوان IP على مدار اليوم." #: https//support.torproject.org/onionservices/onionservices-1/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.title)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 12 Aug '20

12 Aug '20

commit 5f5206cdae7eb31490131f42133c03cfe10f68b5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 17:48:00 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 173c2f2605..d943438f02 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -8603,11 +8603,13 @@ msgid "" "Average number of concurrent users, estimated from data collected over a " "day. We can't say how many distinct users there are." msgstr "" +"متوسط عدد المستخدمين المتزامنين ، مقدرًا من البيانات التي تم جمعها على مدار " +"يوم. لا يمكننا تحديد عدد المستخدمين المتميزين." #: https//support.torproject.org/metrics/country-origin/ #: (content/metrics/country-origin/contents+en.lrquestion.title) msgid "How do you know which countries users come from?" -msgstr "" +msgstr "كيف تعرف البلدان التي يأتي منها المستخدمون؟" #: https//support.torproject.org/metrics/country-origin/ #: (content/metrics/country-origin/contents+en.lrquestion.description) @@ -8616,11 +8618,13 @@ msgid "" "numbers in aggregate form. This is one of the reasons why tor ships with a " "GeoIP database." msgstr "" +"تقوم الدلائل بتحليل عناوين IP إلى رموز البلدان والإبلاغ عن هذه الأرقام في " +"شكل إجمالي. هذا هو أحد أسباب شحن tor مع قاعدة بيانات GeoIP." #: https//support.torproject.org/metrics/directories-reports/ #: (content/metrics/directories-reports/contents+en.lrquestion.title) msgid "Do all directories report these directory request numbers?" -msgstr "" +msgstr "هل تقوم جميع الأدلة بالإبلاغ عن أرقام طلبات الدليل هذه؟" #: https//support.torproject.org/metrics/directories-reports/ #: (content/metrics/directories-reports/contents+en.lrquestion.description) @@ -8628,6 +8632,8 @@ msgid "" "No, but we can see what fraction of directories reported them, and then we " "can extrapolate the total number in the network." msgstr "" +"لا ، ولكن يمكننا أن نرى أي جزء من الأدلة أبلغت عنها ، ومن ثم يمكننا استقراء " +"العدد الإجمالي في الشبكة." #: https//support.torproject.org/metrics/graph-data-point/ #: (content/metrics/graph-data-point/contents+en.lrquestion.title) @@ -8635,6 +8641,8 @@ msgid "" "But I noticed that the last data point went up/down a bit since I last " "looked a few hours ago. Why is that?" msgstr "" +"لكنني لاحظت أن آخر نقطة بيانات ارتفعت / انخفضت قليلاً منذ آخر مرة بحثت فيها " +"قبل ساعات قليلة. لماذا هذا؟" #: https//support.torproject.org/metrics/graph-data-point/ #: (content/metrics/graph-data-point/contents+en.lrquestion.description) @@ -8642,6 +8650,8 @@ msgid "" "The reason is that we publish user numbers once we're confident enough that " "they won't change significantly anymore." msgstr "" +"والسبب هو أننا ننشر أرقام المستخدمين بمجرد أن نكون واثقين بدرجة كافية من " +"أنها لن تتغير بشكل كبير بعد الآن." #: https//support.torproject.org/metrics/graph-data-point/ #: (content/metrics/graph-data-point/contents+en.lrquestion.description) @@ -8649,11 +8659,13 @@ msgid "" "But it's always possible that a directory reports data a few hours after we " "were confident enough, but which then slightly changed the graph." msgstr "" +"ولكن من الممكن دائمًا أن يقوم الدليل بالإبلاغ عن البيانات بعد بضع ساعات من " +"ثقتنا بما فيه الكفاية ، ولكن بعد ذلك غيّر الرسم البياني قليلاً." #: https//support.torproject.org/metrics/graphs/ #: (content/metrics/graphs/contents+en.lrquestion.title) msgid "Why do the graphs end 2 days in the past and not today?" -msgstr "" +msgstr "لماذا تنتهي الرسوم البيانية بيومين في الماضي وليس اليوم؟" #: https//support.torproject.org/metrics/graphs/ #: (content/metrics/graphs/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 12 Aug '20

12 Aug '20

commit 75e494b803003472a3577f4db4cfcd1bf4b4a776 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 17:18:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 0dba68d1e7..173c2f2605 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -8525,17 +8525,18 @@ msgstr "" msgid "" "tl;dr: in the old approach we measured the wrong thing, and now we measure " "the right thing." -msgstr "" +msgstr "في النهج القديم قمنا بقياس الشيء الخطأ ، والآن نقيس الشيء الصحيح." #: https//support.torproject.org/metrics/bridges-reports/ #: (content/metrics/bridges-reports/contents+en.lrquestion.title) msgid "Why are there so few bridge users that are not using the default OR" msgstr "" +"لماذا يوجد عدد قليل جدًا من مستخدمي الجسر الذين لا يستخدمون OR الافتراضي" #: https//support.torproject.org/metrics/bridges-reports/ #: (content/metrics/bridges-reports/contents+en.lrquestion.title) msgid "protocol or that are using IPv6?" -msgstr "" +msgstr "البروتوكول أو التي تستخدم IPv6؟" #: https//support.torproject.org/metrics/bridges-reports/ #: (content/metrics/bridges-reports/contents+en.lrquestion.description) @@ -8543,18 +8544,21 @@ msgid "" "Very few bridges report data on transports or IP versions yet, and by " "default we consider requests to use the default OR protocol and IPv4." msgstr "" +"عدد قليل جدًا من الجسور يبلغ عن بيانات حول عمليات النقل أو إصدارات IP حتى " +"الآن ، وبشكل افتراضي نحن نأخذ في الاعتبار طلبات استخدام بروتوكول OR " +"الافتراضي و IPv4." #: https//support.torproject.org/metrics/bridges-reports/ #: (content/metrics/bridges-reports/contents+en.lrquestion.description) msgid "" "Once more bridges report these data, the numbers will become more accurate." -msgstr "" +msgstr "بمجرد أن تبلغ الجسور عن هذه البيانات ، ستصبح الأرقام أكثر دقة." #: https//support.torproject.org/metrics/censorship-events/ #: (content/metrics/censorship-events/contents+en.lrquestion.title) msgid "" "What are these red and blue dots indicating possible censorship events?" -msgstr "" +msgstr "ما هي هذه النقاط الحمراء والزرقاء التي تشير إلى أحداث رقابة محتملة؟" #: https//support.torproject.org/metrics/censorship-events/ #: (content/metrics/censorship-events/contents+en.lrquestion.description) @@ -8563,6 +8567,8 @@ msgid "" "user numbers over a series of days and predicts the user number in the next " "days." msgstr "" +"نحن ندير نظامًا لاكتشاف الرقابة قائمًا على الشذوذ يبحث في أعداد المستخدمين " +"المقدرة على مدار سلسلة من الأيام ويتوقع عدد المستخدمين في الأيام القادمة." #: https//support.torproject.org/metrics/censorship-events/ #: (content/metrics/censorship-events/contents+en.lrquestion.description) @@ -8570,6 +8576,8 @@ msgid "" "If the actual number is higher or lower, this might indicate a possible " "censorship event or release of censorship." msgstr "" +"إذا كان الرقم الفعلي أعلى أو أقل ، فقد يشير ذلك إلى احتمال وجود حدث رقابة أو" +" تحرير للرقابة." #: https//support.torproject.org/metrics/censorship-events/ #: (content/metrics/censorship-events/contents+en.lrquestion.description) @@ -8577,6 +8585,8 @@ msgid "" "For more details, see our [technical " "report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)." msgstr "" +"لمزيد من التفاصيل ، راجع [تقريرنا الفني] " +"(https://research.torproject.org/techreports/detector-2011-09-09.pdf)" #: https//support.torproject.org/metrics/concurrent-users/ #: (content/metrics/concurrent-users/contents+en.lrquestion.title) @@ -8584,6 +8594,8 @@ msgid "" "So, are these distinct users per day, average number of users connected over" " the day, or what?" msgstr "" +"إذن ، هل هؤلاء المستخدمون المتميزون يوميًا ، متوسط عدد المستخدمين المتصلين " +"على مدار اليوم ، أم ماذا؟" #: https//support.torproject.org/metrics/concurrent-users/ #: (content/metrics/concurrent-users/contents+en.lrquestion.description)

1 0

[tor/master] CI: improve output when skipping doxygen
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 12:13:56 2020 -0400 CI: improve output when skipping doxygen --- scripts/ci/ci-driver.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index ba4b800c04..6faffd7b40 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}" if [[ "${COLOR_CI}" == "yes" ]]; then T_RED=$(tput setaf 1 || true) T_GREEN=$(tput setaf 2 || true) + T_YELLOW=$(tput setaf 3 || true) T_DIM=$(tput dim || true) T_BOLD=$(tput bold || true) T_RESET=$(tput sgr0 || true) else T_RED= T_GREEN= + T_YELLOW= T_DIM= T_BOLD= T_RESET= @@ -85,6 +87,12 @@ function die() echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2 exit 1 } + +function skipping() +{ + echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}" +} + function hooray() { echo "${T_BOLD}${T_GREEN}$*${T_RESET}" @@ -363,12 +371,16 @@ fi FAILED_TESTS="" -if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then +if [[ "${DOXYGEN}" = 'yes' ]]; then start_section Doxygen - if runcmd make doxygen; then - hooray "make doxygen has succeeded." + if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then + if runcmd make doxygen; then + hooray "make doxygen has succeeded." + else + FAILED_TESTS="${FAILED_TESTS} doxygen" + fi else - FAILED_TESTS="${FAILED_TESTS} doxygen" + skipping "make doxygen: doxygen is broken for Tor < 0.4.3" fi end_section Doxygen fi

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit 309eafbc3c0064a670f5f4b11c3639f7ade6229b Merge: 489d33e190 02bb719a94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 36 ++++++++++++++++------- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 77 +++++++++++++++++++++++++------------------------ 3 files changed, 67 insertions(+), 48 deletions(-) diff --cc Makefile.am index 3b30c01f00,f6346fe0fc..1041494da7 --- a/Makefile.am +++ b/Makefile.am @@@ -162,53 -157,40 +162,55 @@@ include src/include.a include doc/include.am include contrib/include.am + manpages: $(nodist_man1_MANS) + EXTRA_DIST+= \ - ChangeLog \ - CONTRIBUTING \ - CODE_OF_CONDUCT \ - INSTALL \ - LICENSE \ - Makefile.nmake \ - README \ - ReleaseNotes \ - scripts/maint/checkIncludes.py \ - scripts/maint/checkSpace.pl \ - scripts/maint/checkShellScripts.sh \ - scripts/maint/practracker/README \ - scripts/maint/practracker/exceptions.txt \ - scripts/maint/practracker/includes.py \ - scripts/maint/practracker/metrics.py \ - scripts/maint/practracker/practracker.py \ - scripts/maint/practracker/practracker_tests.py \ - scripts/maint/practracker/problem.py \ - scripts/maint/practracker/testdata/.may_include \ - scripts/maint/practracker/testdata/a.c \ - scripts/maint/practracker/testdata/b.c \ - scripts/maint/practracker/testdata/ex0-expected.txt \ - scripts/maint/practracker/testdata/ex0.txt \ - scripts/maint/practracker/testdata/ex1-expected.txt \ - scripts/maint/practracker/testdata/ex1.txt \ - scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ - scripts/maint/practracker/testdata/ex.txt \ - scripts/maint/practracker/testdata/header.h \ - scripts/maint/practracker/testdata/not_c_file \ - scripts/maint/practracker/test_practracker.sh \ - scripts/maint/practracker/util.py + ChangeLog \ + CONTRIBUTING \ + CODE_OF_CONDUCT \ + INSTALL \ + LICENSE \ + Makefile.nmake \ + README \ + ReleaseNotes \ + scripts/maint/checkIncludes.py \ + scripts/maint/checkSpace.pl \ + scripts/maint/checkSpaceTest.sh \ + scripts/maint/checkspace_tests/dubious.c \ + scripts/maint/checkspace_tests/dubious.h \ + scripts/maint/checkspace_tests/expected.txt \ + scripts/maint/checkspace_tests/good_guard.h \ + scripts/maint/checkspace_tests/same_guard.h \ + scripts/maint/checkspace_tests/subdir/dubious.c \ + scripts/maint/checkShellScripts.sh \ + scripts/maint/practracker/README \ + scripts/maint/practracker/exceptions.txt \ + scripts/maint/practracker/includes.py \ + scripts/maint/practracker/metrics.py \ + scripts/maint/practracker/practracker.py \ + scripts/maint/practracker/practracker_tests.py \ + scripts/maint/practracker/problem.py \ + scripts/maint/practracker/testdata/.may_include \ + scripts/maint/practracker/testdata/a.c \ + scripts/maint/practracker/testdata/b.c \ + scripts/maint/practracker/testdata/ex0-expected.txt \ + scripts/maint/practracker/testdata/ex0.txt \ + scripts/maint/practracker/testdata/ex1-expected.txt \ + scripts/maint/practracker/testdata/ex1.txt \ + scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ + scripts/maint/practracker/testdata/ex1-regen-expected.txt \ + scripts/maint/practracker/testdata/ex1-regen-overbroad-expected.txt \ + scripts/maint/practracker/testdata/ex.txt \ + scripts/maint/practracker/testdata/header.h \ + scripts/maint/practracker/testdata/not_c_file \ + scripts/maint/practracker/test_practracker.sh \ + scripts/maint/practracker/util.py \ + scripts/coccinelle/apply.sh \ + scripts/coccinelle/check_cocci_parse.sh \ + scripts/coccinelle/exceptions.txt \ + scripts/coccinelle/test-operator-cleanup \ + scripts/coccinelle/tor-coccinelle.h \ + scripts/coccinelle/try_parse.sh ## This tells etags how to find mockable function definitions. AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*$[a-zA-Z0-9_]+$\W*,/\1/s'

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit 02bb719a9494a010b3cad4cf81942ec7619f5806 Merge: 6ef40144ae f5b9471547 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 36 ++++++++++++++++------- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 77 +++++++++++++++++++++++++------------------------ 3 files changed, 67 insertions(+), 48 deletions(-)

1 0

[tor/master] Try disabling "make all" when checking docs.
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit 50b7bd243fdea1ae1ab3ee0c3304d9d39246581c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 11:35:15 2020 -0400 Try disabling "make all" when checking docs. --- .gitlab-ci.yml | 2 +- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 54 ++++++++++++++++++------------------------------- 3 files changed, 23 insertions(+), 35 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3959bba024..8ed615687b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,7 +111,6 @@ debian-distcheck: script: - ./scripts/ci/ci-driver.sh -# TODO: it would be neat to disable the "make all" part of this one. debian-docs: image: debian:stable <<: *debian-template @@ -119,6 +118,7 @@ debian-docs: DOXYGEN: "yes" ASCIIDOC: "yes" CHECK: "no" + RUN_STAGE_BUILD: "no" script: - ./scripts/ci/ci-driver.sh diff --git a/Makefile.am b/Makefile.am index 5d18666edc..a868be7362 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,6 +149,8 @@ include src/include.am include doc/include.am include contrib/include.am +manpages: $(nodist_man1_MANS) + EXTRA_DIST+= \ ChangeLog \ CONTRIBUTING \ diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 05c1415da0..ba4b800c04 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}" # Options for which CI system this is. ON_GITLAB="${ON_GITLAB:-yes}" +# Options for things we usually won't want to skip. +RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}" +RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}" +RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}" + # Options for how to build Tor. All should be yes/no. FATAL_WARNINGS="${FATAL_WARNINGS:-yes}" HARDENING="${HARDENING:-no}" @@ -165,33 +170,6 @@ else } fi -if [[ "$*" == "" ]]; then - RUN_STAGE_CONFIGURE="yes" - RUN_STAGE_BUILD="yes" - RUN_STAGE_TEST="yes" -else - RUN_STAGE_CONFIGURE="no" - RUN_STAGE_BUILD="no" - RUN_STAGE_TEST="no" - - for stage in "$@"; do - case "$stage" in - configure) - RUN_STAGE_CONFIGURE="yes" - ;; - build) - RUN_STAGE_BUILD="yes" - ;; - test) - RUN_STAGE_TEST="yes" - ;; - *) - error "Unknown stage $stage" - ;; - esac - done -fi - ############################################################################# # Validate inputs. @@ -206,6 +184,10 @@ yes_or_no RUST yes_or_no DOXYGEN yes_or_no ASCIIDOC +yes_or_no RUN_STAGE_CONFIGURE +yes_or_no RUN_STAGE_BUILD +yes_or_no RUN_STAGE_TEST + yes_or_no CHECK yes_or_no STEM yes_or_no DISTCHECK @@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then end_section Distcheck fi fi + ############################## # Run tests. @@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then exit 0 fi -if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then - debug "Skipped build stage. Making sure that ./src/app/tor exists." - if [[ ! -f "./src/app/tor" ]]; then - die "$(pwd)/src/app/tor does not exist" - fi -fi - FAILED_TESTS="" if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then @@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then end_section Doxygen fi +if [[ "${ASCIIDOC}" = 'yes' ]]; then + start_section Asciidoc + if runcmd make manpages; then + hooray "make manpages has succeeded." + else + FAILED_TESTS="${FAILED_TESTS} asciidoc" + fi + end_section Asciidoc +fi + if [[ "${CHECK}" = "yes" ]]; then start_section "Check" if runcmd make "${make_options[@]}" check; then

1 0