- tor-commits - lists.torproject.org

[pluggable-transports/snowflake] branch main updated: Scrub ptEvent logs
by gitolite role 12 Apr '22

12 Apr '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a commit to branch main in repository pluggable-transports/snowflake. The following commit(s) were added to refs/heads/main by this push: new e283820 Scrub ptEvent logs e283820 is described below commit e2838201adf1a98ee065cc65598463777afac2dc Author: itchyonion <itchyonion(a)torproject.com> AuthorDate: Wed Mar 23 08:49:28 2022 -0700 Scrub ptEvent logs --- client/pt_event_logger.go | 53 ++++++++++++++++++++++++++++++++++++++++------- go.mod | 3 +-- go.sum | 10 --------- 3 files changed, 47 insertions(+), 19 deletions(-) diff --git a/client/pt_event_logger.go b/client/pt_event_logger.go index 788c074..aae8716 100644 --- a/client/pt_event_logger.go +++ b/client/pt_event_logger.go @@ -1,10 +1,12 @@ package main import ( + "bytes" "fmt" - pt "git.torproject.org/pluggable-transports/goptlib.git" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" + "strings" ) func NewPTEventLogger() event.SnowflakeEventReceiver { @@ -14,30 +16,67 @@ func NewPTEventLogger() event.SnowflakeEventReceiver { type ptEventLogger struct { } +type logSeverity int + +const ( + Debug logSeverity = iota + Info + Notice + Warning + Error +) + +func safePTLog(severity logSeverity, format string, a ...interface{}) { + var buff bytes.Buffer + scrubber := &safelog.LogScrubber{Output: &buff} + + // make sure logString ends with exactly one "\n" so it's not stuck in scrubber.Write()'s internal buffer + logString := strings.TrimRight(fmt.Sprintf(format, a...), "\n") + "\n" + scrubber.Write([]byte(logString)) + + // remove newline before calling pt.Log because it adds a newline + msg := strings.TrimRight(buff.String(), "\n") + + switch severity { + case Error: + pt.Log(pt.LogSeverityError, msg) + case Warning: + pt.Log(pt.LogSeverityWarning, msg) + case Notice: + pt.Log(pt.LogSeverityWarning, msg) + case Info: + pt.Log(pt.LogSeverityInfo, msg) + case Debug: + pt.Log(pt.LogSeverityDebug, msg) + default: + pt.Log(pt.LogSeverityNotice, msg) + } +} + func (p ptEventLogger) OnNewSnowflakeEvent(e event.SnowflakeEvent) { switch e.(type) { case event.EventOnOfferCreated: e := e.(event.EventOnOfferCreated) if e.Error != nil { - pt.Log(pt.LogSeverityNotice, fmt.Sprintf("offer creation failure %v", e.Error.Error())) + safePTLog(Notice, "offer creation failure %v", e.Error.Error()) } else { - pt.Log(pt.LogSeverityNotice, fmt.Sprintf("offer created")) + safePTLog(Notice, "offer created") } case event.EventOnBrokerRendezvous: e := e.(event.EventOnBrokerRendezvous) if e.Error != nil { - pt.Log(pt.LogSeverityNotice, fmt.Sprintf("broker failure %v", e.Error.Error())) + safePTLog(Notice, "broker failure %v", e.Error.Error()) } else { - pt.Log(pt.LogSeverityNotice, fmt.Sprintf("broker rendezvous peer received")) + safePTLog(Notice, "broker rendezvous peer received") } case event.EventOnSnowflakeConnected: - pt.Log(pt.LogSeverityNotice, fmt.Sprintf("connected")) + safePTLog(Notice, "connected") case event.EventOnSnowflakeConnectionFailed: e := e.(event.EventOnSnowflakeConnectionFailed) - pt.Log(pt.LogSeverityNotice, fmt.Sprintf("connection failed %v", e.Error.Error())) + safePTLog(Notice, "trying a new proxy: %v", e.Error.Error()) } } diff --git a/go.mod b/go.mod index 432a237..d05b325 100644 --- a/go.mod +++ b/go.mod @@ -10,13 +10,12 @@ require ( github.com/pion/ice/v2 v2.0.15 github.com/pion/sdp/v3 v3.0.4 github.com/pion/stun v0.3.5 - github.com/pion/transport v0.12.3 // indirect github.com/pion/webrtc/v3 v3.0.15 github.com/prometheus/client_golang v1.10.0 github.com/prometheus/client_model v0.2.0 github.com/refraction-networking/utls v1.0.0 github.com/smartystreets/goconvey v1.6.4 - github.com/stretchr/testify v1.7.0 // indirect + github.com/stretchr/testify v1.7.0 github.com/xtaci/kcp-go/v5 v5.6.1 github.com/xtaci/smux v1.5.15 gitlab.torproject.org/tpo/anti-censorship/geoip v0.0.0-20210928150955-7ce4b3d98d01 diff --git a/go.sum b/go.sum index c2fa108..c2258f0 100644 --- a/go.sum +++ b/go.sum @@ -224,7 +224,6 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0= github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= github.com/pion/dtls/v2 v2.0.4/go.mod h1:qAkFscX0ZHoI1E07RfYPoRw3manThveu+mlTDdOxoGI= -github.com/pion/dtls/v2 v2.0.8 h1:reGe8rNIMfO/UAeFLqO61tl64t154Qfkr4U3Gzu1tsg= github.com/pion/dtls/v2 v2.0.8/go.mod h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10= github.com/pion/dtls/v2 v2.0.12 h1:QMSvNht7FM/XDXij3Ic90SCbl5yL7kppeI4ghfF4in8= github.com/pion/dtls/v2 v2.0.12/go.mod h1:5Pe3QJI0Ajsx+uCfxREeewGFlKYBzLrXe9ku7Y0oRXM= @@ -260,7 +259,6 @@ github.com/pion/transport v0.12.3 h1:vdBfvfU/0Wq8kd2yhUMSDB/x+O4Z9MYVl2fJ5BT4JZw github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= -github.com/pion/udp v0.1.0 h1:uGxQsNyrqG3GLINv36Ff60covYmfrLoxzwnCsIYspXI= github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= @@ -380,8 +378,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 h1:gzMM0EjIYiRmJI3+jBdFuoynZlpxa2JQZsolKu09BXo= -golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 h1:/pEO3GD/ABYAjuakUS6xSEmmlyVS4kxBNkeA9tLJiTI= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -421,8 +417,6 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 h1:b0LrWgu8+q7z4J+0Y3Umo5q1dL7NXBkKBWkaVkAq17E= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c h1:WtYZ93XtWSO5KlOMgPZu7hXY9WhMZpprvlm5VwvAl8c= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -465,9 +459,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e h1:XNp2Flc/1eWQGk5BLzqTAN7fQIwIbfyVTuVxXxZh73M= -golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -475,7 +466,6 @@ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXR golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake] branch main updated (2f89fbc -> aab8064)
by gitolite role 12 Apr '22

12 Apr '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a change to branch main in repository pluggable-transports/snowflake. from 2f89fbc Represent fingerprint internally as byte array new d807e9d Move tor-specific code outside of client library new aab8064 Fix gitlab CI to work with multiple client .go files The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitlab-ci.yml | 2 +- client/lib/lib_test.go | 5 +++-- client/{lib => }/pt_event_logger.go | 2 +- client/snowflake.go | 2 +- go.mod | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) rename client/{lib => }/pt_event_logger.go (97%) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser-bundle-testsuite] branch master updated: Bug 40041: Add @richard @pierov @aguestuser to nightly build emails
by gitolite role 08 Apr '22

08 Apr '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch master in repository tor-browser-bundle-testsuite. The following commit(s) were added to refs/heads/master by this push: new 1b043d6 Bug 40041: Add @richard @pierov @aguestuser to nightly build emails 1b043d6 is described below commit 1b043d615ea657999a771012273fa9f355629554 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Fri Apr 8 13:05:56 2022 +0200 Bug 40041: Add @richard @pierov @aguestuser to nightly build emails Closes #40041 --- config/tb-build-01.torproject.org | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/tb-build-01.torproject.org b/config/tb-build-01.torproject.org index 6fb2fd9..39be9e3 100644 --- a/config/tb-build-01.torproject.org +++ b/config/tb-build-01.torproject.org @@ -48,7 +48,13 @@ my %res = ( 'reports-url' => 'https://nightlies.tbb.torproject.org/nightly-builds/reports/', 'email-subject' => '[build result: [% success ? "ok" : "failed" %]] [% options.name %]', 'email-report' => 1, - 'email-to' => [ 'boklm(a)torproject.org', 'sysrqb(a)torproject.org', ], + 'email-to' => [ + 'aguestuser(a)torproject.org', + 'boklm(a)torproject.org', + 'pierov(a)torproject.org', + 'richard(a)torproject.org', + 'sysrqb(a)torproject.org', + ], 'email-from' => 'Tor Browser Nightly Builds <tb-builder(a)tb-build-01.torproject.org>', 'test_post' => $run_rsync, ); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (f18afc0b83 -> 7747469dbe)
by gitolite role 07 Apr '22

07 Apr '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from f18afc0b83 version: Bump version to 0.4.7.6-rc new c885a18a2e version: Bump version to 0.4.7.6-rc-dev new 7747469dbe doc: Minor changes to the Releasing doc The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- doc/HACKING/ReleasingTor.md | 6 +++--- src/win32/orconfig.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor] annotated tag tor-0.4.7.6-rc created (now 14cc2112b5)
by gitolite role 07 Apr '22

07 Apr '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to annotated tag tor-0.4.7.6-rc in repository tor. at 14cc2112b5 (tag) tagging f18afc0b839a10366cf7154cde61bcf520a93462 (commit) replaces tor-0.4.7.5-alpha by David Goulet on Thu Apr 7 11:47:51 2022 -0400 - Log ----------------------------------------------------------------- Tor 0.4.7.6-rc -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEt0QX7d8irJ+ekPSRQuhqKhH0jTYFAmJPB6wACgkQQuhqKhH0 jTZfTwf+Ksefe1WyydIKwza1NGbib3tmej4Gqs0mEVi4ny0s37bMucjnXXxuq/4T j8LCoURm3FNuau+CiTUDCBdZntGBcBGLdr74XlEyIwtyDZ/VtzgICx1FtjjB3tO8 atUGh1xe0p9XxbDO+1uRg7hCRZ2u7S3YMNwwYm1C1IdhgzhIcGJ/UnGz59D15y2Q T7f0eYgpVM/gp2+tgkjvoKMkj5yvFjVVsS58CcHalcURGtzlAE4KyzdqGP/nyGBM zXdGYCxHgZXzkBcI8e1J1iOgKdk0bbCa4geE516k2jN6C1xDORzDqI+nZen5THTs +1NbBrgjU0hpf/YFzHXYa8WgnzFIiA== =8dVU -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (6e36b65475 -> f18afc0b83)
by gitolite role 07 Apr '22

07 Apr '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from 6e36b65475 Merge branch 'tor-gitlab/mr/557' new 28193dbf9d Update geoip files to match ipfire location db, 2022/04/07. new 133c64075b fallbackdir: Update list generated on April 07, 2022 new 0d90b0e5d1 release: ChangeLog and ReleaseNotes for 0.4.7.6-rc new f18afc0b83 version: Bump version to 0.4.7.6-rc The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ChangeLog | 18 + changes/clone3-sandbox | 3 - configure.ac | 4 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/app/config/fallback_dirs.inc | 1000 ++++++++--------- src/config/geoip | 2024 ++++++++++++++++++++--------------- src/config/geoip6 | 1226 ++++++++++++++------- src/win32/orconfig.h | 2 +- 8 files changed, 2544 insertions(+), 1735 deletions(-) delete mode 100644 changes/clone3-sandbox -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 4

[builders/tor-browser-build] branch master updated: Update rbm submodule for rbm#40036
by gitolite role 07 Apr '22

07 Apr '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new bb5ce88 Update rbm submodule for rbm#40036 bb5ce88 is described below commit bb5ce88c9efeb325f931fb0000652c97ab1c6816 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Thu Apr 7 12:38:52 2022 +0200 Update rbm submodule for rbm#40036 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index adb7dca..87d4a77 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit adb7dcabb13b4345d2c4a9a1ef229105cf0215b9 +Subproject commit 87d4a77a6f6bf747207800e601552a70d9910ffd -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch master updated: Bug 40036: Avoid some calls to lsb_release
by gitolite role 07 Apr '22

07 Apr '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch master in repository builders/rbm. The following commit(s) were added to refs/heads/master by this push: new 87d4a77 Bug 40036: Avoid some calls to lsb_release 87d4a77 is described below commit 87d4a77a6f6bf747207800e601552a70d9910ffd Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Wed Apr 6 11:40:34 2022 +0200 Bug 40036: Avoid some calls to lsb_release --- doc/options_misc.asc | 6 ++++-- lib/RBM/DefaultConfig.pm | 13 +------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/doc/options_misc.asc b/doc/options_misc.asc index 876768b..5612df3 100644 --- a/doc/options_misc.asc +++ b/doc/options_misc.asc @@ -28,14 +28,16 @@ tar:: set to +timestamp+. This option takes a +tar_src+ argument which is an array containing source files or directories, and a +tar_args+ argument which is the tar arguments to create the file (something - like '-cf filename.tar'). + like '-cf filename.tar'). By default, GNU options are used in + tar and find, but you can disable that with +gnu_utils+. zip:: Use this option instead of 'zip' in build scripts when you want to create deterministic zip files. This option takes a +zip_src+ argument which is an array containing source files or directories, and a +zip_args+ arguments which is usually the destination zip - file, and optionaly other zip options. + file, and optionaly other zip options. By default, GNU options + are used in find, but you can disable that with +gnu_utils+. install_package:: This option can be used in a script when you need to install a diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 059ffdd..516156e 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -412,18 +412,7 @@ mv -f "\$tmpfile" [% shell_quote(dest_dir _ "/" _ c("filename")) %] URLGET sig_ext => [ qw(gpg asc sig) ], enable => 1, - gnu_utils => sub { - my ($project, $options) = @_; - my $distro = RBM::project_config($project, 'lsb_release/id', $options); - my %non_gnu = ( - 'Mac OS X' => 1, - NetBSD => 1, - OpenBSD => 1, - FreeBSD => 1, - DragonFly => 1, - ); - return ! $non_gnu{$distro}; - }, + gnu_utils => 1, tar => <<TAR_END, [%- SET src = c('tar_src', { error_if_undef => 1 }) -%] find [% src.join(' ') %] [% IF c('gnu_utils') %]-executable[% ELSE %]-perm +0111[% END %] -exec chmod 700 {} \\; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[stem] branch master updated: Use daemon attribute instead of deprecated setDaemon
by gitolite role 06 Apr '22

06 Apr '22

This is an automated email from the git hooks/post-receive script. atagar pushed a commit to branch master in repository stem. The following commit(s) were added to refs/heads/master by this push: new 5e481997 Use daemon attribute instead of deprecated setDaemon 5e481997 is described below commit 5e481997e4761445f2459b83eb2fad803d8d1cc7 Author: Knock Knock Who <101834529+KnockKnockWho(a)users.noreply.github.com> AuthorDate: Tue Mar 29 23:57:37 2022 +0200 Use daemon attribute instead of deprecated setDaemon --- docs/_static/example/fibonacci_threaded.py | 2 +- stem/connection.py | 2 +- stem/control.py | 2 +- stem/util/test_tools.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/_static/example/fibonacci_threaded.py b/docs/_static/example/fibonacci_threaded.py index 9570f855..1bc776ee 100644 --- a/docs/_static/example/fibonacci_threaded.py +++ b/docs/_static/example/fibonacci_threaded.py @@ -16,7 +16,7 @@ def main(): for i in range(4): t = threading.Thread(target = fibonacci, args = (35,)) - t.setDaemon(True) + t.daemon = True t.start() threads.append(t) diff --git a/stem/connection.py b/stem/connection.py index 005949ef..01c38eab 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -278,7 +278,7 @@ def connect(control_port: Tuple[str, Union[str, int]] = ('127.0.0.1', 'default') loop = asyncio.new_event_loop() loop_thread = threading.Thread(target = loop.run_forever, name = 'asyncio') - loop_thread.setDaemon(True) + loop_thread.daemon = True loop_thread.start() try: diff --git a/stem/control.py b/stem/control.py index 159b2046..b9e0db24 100644 --- a/stem/control.py +++ b/stem/control.py @@ -964,7 +964,7 @@ class BaseController(Synchronous): args = (self, state, change_timestamp) notice_thread = threading.Thread(target = listener, args = args, name = '%s notification' % state) - notice_thread.setDaemon(True) + notice_thread.daemon = True notice_thread.start() self._state_change_threads.append(notice_thread) else: diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 7343e674..29a8dc44 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -173,7 +173,7 @@ class AsyncTest(object): name = 'Background test of %s' % self.name, ) - self._process.setDaemon(True) + self._process.daemon = True else: self._process = multiprocessing.Process(target = _wrapper, args = (child_pipe, self._runner, self._runner_args)) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-bundle-testsuite] branch master updated: Bug 40042: setup-virtualenv attempts to install the wrong version of the distro package
by gitolite role 06 Apr '22

06 Apr '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch master in repository tor-browser-bundle-testsuite. The following commit(s) were added to refs/heads/master by this push: new 931c6dc Bug 40042: setup-virtualenv attempts to install the wrong version of the distro package 931c6dc is described below commit 931c6dc31d96f850383b6e6113795999d3420853 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Thu Mar 31 20:23:22 2022 +0000 Bug 40042: setup-virtualenv attempts to install the wrong version of the distro package --- .gitignore | 2 +- setup-virtualenv | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0e386d9..60be2a3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ *.pyc clones virtualenv -virtualenv-marionette-4.3.0 +virtualenv-marionette-* reports tmp bundle diff --git a/setup-virtualenv b/setup-virtualenv index 9641ee1..597e4b5 100755 --- a/setup-virtualenv +++ b/setup-virtualenv @@ -46,6 +46,9 @@ unless (-d $virtenv_marionette_dir) { # upgrade pip and setuptools run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'pip'); run("$virtenv_marionette_dir/$bin/pip", 'install', '--upgrade', 'setuptools'); + # for some reason setup.py tries to install distro version 1.7 which is not + # compatible with python2.7, so have pip resolve this dependency manually to 1.6 + run("$virtenv_marionette_dir/$bin/pip", 'install', 'distro'); run_from_dir('marionette', "$virtenv_marionette_dir/$bin/python", 'setup.py', 'develop'); } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0