Ticket #18062: 0003-Sort-pt-s.patch

File 0003-Sort-pt-s.patch, 4.5 KB (added by arlolra, 4 years ago)
  • conf/gitolite.conf

    From 031d6eaba16003bd126a887735bce449f578a460 Mon Sep 17 00:00:00 2001
    From: Arlo Breault <arlolra@gmail.com>
    Date: Thu, 14 Jan 2016 10:10:45 -0800
    Subject: [PATCH 3/4] Sort pt's
    
    ---
     conf/gitolite.conf | 43 ++++++++++++++++++++++---------------------
     1 file changed, 22 insertions(+), 21 deletions(-)
    
    diff --git a/conf/gitolite.conf b/conf/gitolite.conf
    index 4c29f7d..bf93a8a 100644
    a b repo orfoxos/tor 
    725725    config gitweb.category                   = OrfoxOS
    726726orfoxos/tor "The Tor Project" = "Fork of Tor with OrfoxOS integration patches"
    727727
     728repo pluggable-transports/bundle
     729    RW                                       = dcf
     730    RW                                       = asn
     731    RW                                       = infinity0
     732    config hooks.email-enabled               = true
     733    config hooks.mailinglist                 = tor-commits@lists.torproject.org
     734    config hooks.irc-enabled                 = true
     735    config hooks.ircproject                  = or
     736pluggable-transports/bundle "The Tor Project" = "Pluggable transports browser bundle"
     737
    728738repo pluggable-transports/fog
    729739    RW                                       = asn
    730740    RW                                       = dcf
    repo pluggable-transports/meek 
    751761    config hooks.ircproject                  = or
    752762pluggable-transports/meek "The Tor Project" = "HTTPS transport"
    753763
    754 repo pluggable-transports/pyptlib
    755     RW                                       = asn
    756     config hooks.email-enabled               = true
    757     config hooks.mailinglist                 = tor-commits@lists.torproject.org
    758     config hooks.irc-enabled                 = true
    759     config hooks.ircproject                  = or
    760 pluggable-transports/pyptlib "The Tor Project" = "Python pluggable transport library"
    761 
    762764repo pluggable-transports/obfs4
    763765    RW                                       = asn
    764766    RW                                       = dcf
    repo pluggable-transports/obfsproxy 
    777779    config hooks.ircproject                  = or
    778780pluggable-transports/obfsproxy "The Tor Project" = "Pluggable transport for obfuscated traffic"
    779781
    780 repo pluggable-transports/bundle
    781     RW                                       = dcf
    782     RW                                       = asn
    783     RW                                       = infinity0
    784     config hooks.email-enabled               = true
    785     config hooks.mailinglist                 = tor-commits@lists.torproject.org
    786     config hooks.irc-enabled                 = true
    787     config hooks.ircproject                  = or
    788 pluggable-transports/bundle "The Tor Project" = "Pluggable transports browser bundle"
    789782
    790783repo pluggable-transports/obfsproxy-legacy
    791784    RW                                       = @obfsproxy
    repo pluggable-transports/obfsproxy-legacy 
    795788    config hooks.ircproject                  = or
    796789pluggable-transports/obfsproxy-legacy "The Tor Project" = "The old (pre 2013) obfuscating proxy written in C"
    797790
    798 repo pluggable-transports/websocket
    799     RW                                       = dcf
    800     RW                                       = infinity0
     791repo pluggable-transports/pyptlib
     792    RW                                       = asn
    801793    config hooks.email-enabled               = true
    802794    config hooks.mailinglist                 = tor-commits@lists.torproject.org
    803795    config hooks.irc-enabled                 = true
    804796    config hooks.ircproject                  = or
    805 pluggable-transports/websocket "The Tor Project" = "WebSocket transport"
     797pluggable-transports/pyptlib "The Tor Project" = "Python pluggable transport library"
    806798
    807799repo pluggable-transports/snowflake
    808800    RW                                       = @snowflake
    repo pluggable-transports/snowflake 
    812804    config hooks.ircproject                  = or
    813805pluggable-transports/snowflake "The Tor Project" = "A pluggable transport using WebRTC"
    814806
     807repo pluggable-transports/websocket
     808    RW                                       = dcf
     809    RW                                       = infinity0
     810    config hooks.email-enabled               = true
     811    config hooks.mailinglist                 = tor-commits@lists.torproject.org
     812    config hooks.irc-enabled                 = true
     813    config hooks.ircproject                  = or
     814pluggable-transports/websocket "The Tor Project" = "WebSocket transport"
     815
    815816repo pups
    816817    RW                                       = lunar
    817818    RW                                       = colin