nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reformat the changelog for 0.2.5.4-alpha. No textual changes.

Browse Source 
Also, add a script to do this, since doing it manually with fmt sucks.
This commit is contained in:
Nick Mathewson 2014-04-24 13:44:24 -04:00
parent 2bea2facdc
commit 9f691ecb5b
2 changed files with 249 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

214
ChangeLog
View File

@ -1,16 +1,18 @@
Changes in version 0.2.5.4-alpha - 2014-04-?? Changes in version 0.2.5.4-alpha - 2014-04-??
This release includes several security and performance improvements
for clients and relays, including XXX
o Major features (security): o Major features (security):
- Block authority signing keys that were used on an authorities - Block authority signing keys that were used on an authorities
vulnerable to the "heartbleed" bug in openssl (CVE-2014-0160). vulnerable to the "heartbleed" bug in openssl (CVE-2014-0160). (We
(We don't have any evidence that these keys _were_ compromised; don't have any evidence that these keys _were_ compromised; we're
we're doing this to be prudent.) Resolves ticket 11464. doing this to be prudent.) Resolves ticket 11464.
o Deprecated versions: o Deprecated versions:
- Tor 0.2.2.x has reached end-of-life; it has received no patches or - Tor 0.2.2.x has reached end-of-life; it has received no patches or
attention for some while. Directory authorities no longer accept attention for some while. Directory authorities no longer accept
descriptors from Tor relays running any version of Tor prior to Tor descriptors from Tor relays running any version of Tor prior to
0.2.3.16-alpha. Resolves ticket 11149. Tor 0.2.3.16-alpha. Resolves ticket 11149.
o Major features (relay performance): o Major features (relay performance):
- Faster server-side lookups of rendezvous and introduction point - Faster server-side lookups of rendezvous and introduction point
@ -20,20 +22,19 @@ Changes in version 0.2.5.4-alpha - 2014-04-??
- Avoid wasting cycles looking for usable circuit IDs. Previously, - Avoid wasting cycles looking for usable circuit IDs. Previously,
when allocating a new circuit ID, we would in the worst case do a when allocating a new circuit ID, we would in the worst case do a
linear scan over the entire possible range of circuit IDs before linear scan over the entire possible range of circuit IDs before
deciding that we had exhausted our possibilities. Now, we deciding that we had exhausted our possibilities. Now, we try 64
try 64 circuit IDs at random before deciding that we probably circuit IDs at random before deciding that we probably won't
won't succeed. Fix for a possible root cause of ticket succeed. Fix for a possible root cause of ticket #11553.
#11553.
o Major features (seccomp2 sandbox): o Major features (seccomp2 sandbox):
- Refinements and improvements to the Linux seccomp2 sandbox code: - Refinements and improvements to the Linux seccomp2 sandbox code:
the sandbox can now run a test network for multiple hours without the sandbox can now run a test network for multiple hours without
crashing. (Previous crash reasons included: reseeding the OpenSSL PRNG, crashing. (Previous crash reasons included: reseeding the OpenSSL
seeding the Libevent PRNG, using the wrong combination of CLOEXEC and PRNG, seeding the Libevent PRNG, using the wrong combination of
NONBLOCK at the same place and time, having server keys, being an CLOEXEC and NONBLOCK at the same place and time, having server
authority, receiving a HUP, or using IPv6.) The sandbox is still keys, being an authority, receiving a HUP, or using IPv6.) The
experimental, and more bugs will probably turn up. To try it, sandbox is still experimental, and more bugs will probably turn
enable "Sandbox 1" on a Linux host. up. To try it, enable "Sandbox 1" on a Linux host.
- Strengthen the Linux seccomp2 sandbox code: the sandbox can now - Strengthen the Linux seccomp2 sandbox code: the sandbox can now
test the arguments for rename(), and blocks _sysctl() entirely. test the arguments for rename(), and blocks _sysctl() entirely.
- When the Linux syscall sandbox finds an illegal system call, it - When the Linux syscall sandbox finds an illegal system call, it
@ -43,13 +44,13 @@ Changes in version 0.2.5.4-alpha - 2014-04-??
o Major bugfixes (TLS cipher selection): o Major bugfixes (TLS cipher selection):
- Generate the server's preference list for ciphersuites - Generate the server's preference list for ciphersuites
automatically based on uniform criteria, and considering all automatically based on uniform criteria, and considering all
OpenSSL ciphersuites with acceptable strength and forward OpenSSL ciphersuites with acceptable strength and forward secrecy.
secrecy. (The sort order is: prefer AES to 3DES; break ties by (The sort order is: prefer AES to 3DES; break ties by preferring
preferring ECDHE to DHE; break ties by preferring GCM to CBC; ECDHE to DHE; break ties by preferring GCM to CBC; break ties by
break ties by preferring SHA384 to SHA256 to SHA1; and finally, preferring SHA384 to SHA256 to SHA1; and finally, break ties by
break ties by preferring AES256 to AES128.) This resolves bugs preferring AES256 to AES128.) This resolves bugs #11513, #11492,
#11513, #11492, #11498, #11499. Bugs reported by 'cypherpunks'. #11498, #11499. Bugs reported by 'cypherpunks'. Bugfix on
Bugfix on 0.2.4.8-alpha. 0.2.4.8-alpha.
- Servers now trust themselves to have a better view than clients of - Servers now trust themselves to have a better view than clients of
which TLS ciphersuites to choose. (Thanks to #11513, the server which TLS ciphersuites to choose. (Thanks to #11513, the server
list is now well-considered, whereas the client list has been list is now well-considered, whereas the client list has been
@ -67,14 +68,14 @@ Changes in version 0.2.5.4-alpha - 2014-04-??
- Fix another possibly undefined pointer operations in the eventdns - Fix another possibly undefined pointer operations in the eventdns
fallback implementation. Another case of bug #10363; bugfix on fallback implementation. Another case of bug #10363; bugfix on
0.1.2.1-alpha. 0.1.2.1-alpha.
- Use AddressSanitizer and Ubsan sanitizers (in clang-3.4) to fix some - Use AddressSanitizer and Ubsan sanitizers (in clang-3.4) to fix
miscellaneous errors in our tests and codebase. Fix for bug 11232. some miscellaneous errors in our tests and codebase. Fix for bug
Bugfixes on versions back as far as 0.2.1.11-alpha. 11232. Bugfixes on versions back as far as 0.2.1.11-alpha.
o Minor bugfixes (logging): o Minor bugfixes (logging):
- Log only one message when we start logging in an unsafe - Log only one message when we start logging in an unsafe way.
way. Previously, we would log as many messages as we had Previously, we would log as many messages as we had problems. Fix
problems. Fix for #9870; bugfix on 0.2.5.1-alpha. for #9870; bugfix on 0.2.5.1-alpha.
- Using the Linux syscall sandbox no longer prevents stack-trace - Using the Linux syscall sandbox no longer prevents stack-trace
logging on crashes or errors. Fixes part 11465; bugfix on logging on crashes or errors. Fixes part 11465; bugfix on
0.2.5.1-alpha. 0.2.5.1-alpha.
@ -83,10 +84,10 @@ Changes in version 0.2.5.4-alpha - 2014-04-??
connection has failed because of "DONE" or other junk reasons. connection has failed because of "DONE" or other junk reasons.
Fixes bug 10431; bugfix on 0.2.1.1-alpha. Fixes bug 10431; bugfix on 0.2.1.1-alpha.
- Improve the warning message when trying to enable the Linux - Improve the warning message when trying to enable the Linux
sandbox code on a Tor built without libseccomp. Instead of sandbox code on a Tor built without libseccomp. Instead of saying
saying "Sandbox is not implemented on this platform", we now "Sandbox is not implemented on this platform", we now explain that
explain that we to need be built with libseccomp. Fixes bug we to need be built with libseccomp. Fixes bug 11543; bugfix on
11543; bugfix on 0.2.5.1-alpha. 0.2.5.1-alpha.
- Avoid generating spurious warnings and failure messages when - Avoid generating spurious warnings and failure messages when
starting with DisableNetwork enabled. Fixes bug 11200 and bug starting with DisableNetwork enabled. Fixes bug 11200 and bug
10405; bugfix on 0.2.3.9-alpha. 10405; bugfix on 0.2.3.9-alpha.
@ -94,11 +95,13 @@ Changes in version 0.2.5.4-alpha - 2014-04-??
o Minor bugfixes (closing channels): o Minor bugfixes (closing channels):
- If write_to_buf() in connection_write_to_buf_impl_() ever fails, - If write_to_buf() in connection_write_to_buf_impl_() ever fails,
check if it's an or_connection_t and correctly call check if it's an or_connection_t and correctly call
connection_or_close_for_error() rather than connection_mark_for_close() connection_or_close_for_error() rather than
directly. Fixes bug #11304; bugfix on 0.2.4.4-alpha. connection_mark_for_close() directly. Fixes bug #11304; bugfix on
0.2.4.4-alpha.
- When closing all connections on setting DisableNetwork to 1, use - When closing all connections on setting DisableNetwork to 1, use
connection_or_close_normally() rather than closing orconns out from connection_or_close_normally() rather than closing orconns out
under the channel layer. Fixes bug #11306; bugfix on 0.2.4.4-alpha. from under the channel layer. Fixes bug #11306; bugfix on
0.2.4.4-alpha.
o Minor bugfixes (controller): o Minor bugfixes (controller):
- Avoid sending an garbage value to the controller when a circuit is - Avoid sending an garbage value to the controller when a circuit is
@ -109,9 +112,9 @@ Changes in version 0.2.5.4-alpha - 2014-04-??
CPPFLAGS. Fixes bug 11296; bugfix on 0.2.5.3-alpha. CPPFLAGS. Fixes bug 11296; bugfix on 0.2.5.3-alpha.
o Minor bugfixes (bridges): o Minor bugfixes (bridges):
- Avoid potential crashes or bad behavior when launching a - Avoid potential crashes or bad behavior when launching a server-
server-side managed proxy with ORPort or ExtORPort temporarily side managed proxy with ORPort or ExtORPort temporarily disabled.
disabled. Fixes bug 9650; bugfix on 0.2.3.16-alpha. Fixes bug 9650; bugfix on 0.2.3.16-alpha.
o Minor bugfixes (misc): o Minor bugfixes (misc):
- Don't re-initialize a second set of openssl mutexes when starting - Don't re-initialize a second set of openssl mutexes when starting
@ -122,53 +125,53 @@ Changes in version 0.2.5.4-alpha - 2014-04-??
object. Fixes bug 11275; bugfix on 0.2.4.13-alpha. object. Fixes bug 11275; bugfix on 0.2.4.13-alpha.
o Minor bugfixes (platform-specific): o Minor bugfixes (platform-specific):
- Fix compilation on Solaris, which does not have <endian.h>. - Fix compilation on Solaris, which does not have <endian.h>. Fixes
Fixes bug 11426; bugfix on 0.2.5.3-alpha. bug 11426; bugfix on 0.2.5.3-alpha.
- When dumping a malformed directory object to disk, save it in binary - When dumping a malformed directory object to disk, save it in
mode on windows, not text mode. Fixes bug 11342; bugfix on binary mode on windows, not text mode. Fixes bug 11342; bugfix on
0.2.2.1-alpha. 0.2.2.1-alpha.
- When reporting a failure from make_socket_reuseable(), don't - When reporting a failure from make_socket_reuseable(), don't
report a warning when we get a failure from an incoming socket report a warning when we get a failure from an incoming socket on
on OSX. Fix for bug 10081. OSX. Fix for bug 10081.
o Minor bugfixes (trivial memory leaks): o Minor bugfixes (trivial memory leaks):
- Free placeholder entries in our circuit table at exit; fixes - Free placeholder entries in our circuit table at exit; fixes a
a harmless memory leak. Fixes bug 11278; bugfix on 0.2.5.1-alpha. harmless memory leak. Fixes bug 11278; bugfix on 0.2.5.1-alpha.
- Resolve some memory leaks found by coverity in the unit tests, - Resolve some memory leaks found by coverity in the unit tests, on
on exit in tor-gencert, and on a failure to compute digests exit in tor-gencert, and on a failure to compute digests for our
for our own keys when generating a v3 networkstatus vote. own keys when generating a v3 networkstatus vote. These leaks
These leaks should never have affected anyone in practice. should never have affected anyone in practice.
o Minor bugfixes (hidden service): o Minor bugfixes (hidden service):
- Only retry attempts to connect to a chosen rendezvous point 8 times, - Only retry attempts to connect to a chosen rendezvous point 8
not 30. Fixes bug #4241; bugfix on 0.1.0.1-rc. times, not 30. Fixes bug #4241; bugfix on 0.1.0.1-rc.
o Minor bugfixes (bridge client): o Minor bugfixes (bridge client):
- Stop accepting bridge lines containing hostnames. Doing so allowed - Stop accepting bridge lines containing hostnames. Doing so allowed
clients to perform DNS requests on the hostnames, which was not clients to perform DNS requests on the hostnames, which was not
sensible behavior. Fixes bug 10801; bugfix on 0.2.0.1-alpha. sensible behavior. Fixes bug 10801; bugfix on 0.2.0.1-alpha.
- Fix a bug where a client-side Tor with pluggable transports - Fix a bug where a client-side Tor with pluggable transports would
would take 60 seconds to bootstrap if a config re-read was take 60 seconds to bootstrap if a config re-read was triggered at
triggered at just the right timing during bootstrap. Refixes bug just the right timing during bootstrap. Refixes bug 11156; bugfix
11156; bugfix on 0.2.5.3-alpha. on 0.2.5.3-alpha.
- Avoid 60-second delays in the bootstrapping process when Tor - Avoid 60-second delays in the bootstrapping process when Tor is
is launching for a second time while using bridges. Fixes bug 9229; launching for a second time while using bridges. Fixes bug 9229;
bugfix on 0.2.0.3-alpha. bugfix on 0.2.0.3-alpha.
o Minor bugfixes (DNS): o Minor bugfixes (DNS):
- When receing a DNS query for an unsupported type, reply with - When receing a DNS query for an unsupported type, reply with no
no answer rather than with a NOTIMPL error. This behavior isn't answer rather than with a NOTIMPL error. This behavior isn't
correct either, but it will break fewer client programs, we hope. correct either, but it will break fewer client programs, we hope.
Fixes bug 10268; bugfix on 0.2.0.1-alpha. Original patch Fixes bug 10268; bugfix on 0.2.0.1-alpha. Original patch from
from "epoch". "epoch".
o Minor bugfixes (exit): o Minor bugfixes (exit):
- Stop leaking memory when we successfully resolve a PTR record. - Stop leaking memory when we successfully resolve a PTR record.
Fixes bug 11437; bugfix on 0.2.4.7-alpha. Fixes bug 11437; bugfix on 0.2.4.7-alpha.
o Minor features (Transparent proxy): o Minor features (Transparent proxy):
- Support the ipfw firewall interface for transparent proxy support on - Support the ipfw firewall interface for transparent proxy support
FreeBSD. To enable it, set "TransProxyType ipfw" in your torrc. on FreeBSD. To enable it, set "TransProxyType ipfw" in your torrc.
Resolves ticket 10267; patch from "yurivict". Resolves ticket 10267; patch from "yurivict".
- Support OpenBSD's divert-to rules with the pf firewall, when - Support OpenBSD's divert-to rules with the pf firewall, when
"TransProxyType pf-divert" is specified. This allows Tor to run a "TransProxyType pf-divert" is specified. This allows Tor to run a
@ -178,93 +181,90 @@ Changes in version 0.2.5.4-alpha - 2014-04-??
from Dana Koch. from Dana Koch.
o Minor features (security): o Minor features (security):
- New --enable-expensive-hardening option to turn on security hardening - New --enable-expensive-hardening option to turn on security
options that consume nontrivial amounts of CPU and memory. Right now, hardening options that consume nontrivial amounts of CPU and
this includes AddressSanitizer and UbSan. Closes ticket 11477. memory. Right now, this includes AddressSanitizer and UbSan.
Closes ticket 11477.
- If you don't specify MaxMemInQueues yourself, Tor now tries to - If you don't specify MaxMemInQueues yourself, Tor now tries to
pick a good value based on your total system memory. Previously, pick a good value based on your total system memory. Previously,
the default was always 8 GB. You can still override the default by the default was always 8 GB. You can still override the default by
setting MaxMemInQueues yourself. Resolves ticket 11396. setting MaxMemInQueues yourself. Resolves ticket 11396.
o Minor features (usability): o Minor features (usability):
- Demote the message that we give when a flushing connection times - Demote the message that we give when a flushing connection times
out for too long from NOTICE to INFO. It was usually meaningless. out for too long from NOTICE to INFO. It was usually meaningless.
Resolves ticket 5286. Resolves ticket 5286.
- Don't log so many notice-level bootstrapping messages at startup about - Don't log so many notice-level bootstrapping messages at startup
downloading descriptors. Previously, we'd log a notice whenever we about downloading descriptors. Previously, we'd log a notice
learned about more routers. Now, we only log a notice at every 5% of whenever we learned about more routers. Now, we only log a notice
progress. Fixes bug 9963. at every 5% of progress. Fixes bug 9963.
o Minor features (performance, compatibility): o Minor features (performance, compatibility):
- Update the list of TLS cipehrsuites that a client advertises - Update the list of TLS cipehrsuites that a client advertises to
to match those advertised by Firefox 28. This enables selection of match those advertised by Firefox 28. This enables selection of
(fast) GCM ciphersuites, disables some strange old ciphers, and (fast) GCM ciphersuites, disables some strange old ciphers, and
disables the ECDH (not to be confused with ECDHE) ciphersuites. disables the ECDH (not to be confused with ECDHE) ciphersuites.
Resolves ticket 11438. Resolves ticket 11438.
o Minor bugfixes (IPv6): o Minor bugfixes (IPv6):
- When using DNSPort and AutomapHostsOnResolve, respond to AAAA - When using DNSPort and AutomapHostsOnResolve, respond to AAAA
requests with AAAA automapped answers. Fixes bug 10468; bugfix requests with AAAA automapped answers. Fixes bug 10468; bugfix on
on 0.2.4.7-alpha. 0.2.4.7-alpha.
o Minor features (relay): o Minor features (relay):
- If a circuit timed out for at least 3 minutes check if we have a new - If a circuit timed out for at least 3 minutes check if we have a
external IP address the next time we run our routine checks. If our new external IP address the next time we run our routine checks.
IP address has changed, then publish a new descriptor with the new If our IP address has changed, then publish a new descriptor with
IP address. Resolves ticket 2454. the new IP address. Resolves ticket 2454.
- Warn less verbosely when receiving a misformed ESTABLISH_RENDEZVOUS - Warn less verbosely when receiving a misformed
cell. Fixes ticket 11279. ESTABLISH_RENDEZVOUS cell. Fixes ticket 11279.
- When we run out of usable circuit IDs on a channel, log only one - When we run out of usable circuit IDs on a channel, log only one
warning for the whole channel, and include a description of warning for the whole channel, and include a description of how
how many circuits there were on the channel. Fix for part of ticket many circuits there were on the channel. Fix for part of ticket
#11553. #11553.
o Minor features (controller): o Minor features (controller):
- Make the entire exit policy available from the control port via - Make the entire exit policy available from the control port via
GETINFO exit-policy/*. Implements enhancement #7952. Patch from GETINFO exit-policy/*. Implements enhancement #7952. Patch from
"rl1987". "rl1987".
- Because of the fix for ticket 11396, the real limit for memory - Because of the fix for ticket 11396, the real limit for memory
usage may no longer match the configured MaxMemInQueues value. usage may no longer match the configured MaxMemInQueues value. The
The real limit is now exposed via GETINFO limits/max-mem-in-queues. real limit is now exposed via GETINFO limits/max-mem-in-queues.
o Minor features (misc): o Minor features (misc):
- Always check return values for unlink, munmap, UnmapViewOfFile; - Always check return values for unlink, munmap, UnmapViewOfFile;
check strftime return values more often. In some cases all we check strftime return values more often. In some cases all we can
can do is report a warning, but this may help prevent deeper do is report a warning, but this may help prevent deeper bugs from
bugs from going unnoticed. Closes ticket 8787. going unnoticed. Closes ticket 8787.
o Minor features (bridge client): o Minor features (bridge client):
- Report a failure to connect to a bridge because its transport - Report a failure to connect to a bridge because its transport type
type has no configured pluggable transport as a new type of bootstrap has no configured pluggable transport as a new type of bootstrap
failure. Resolves ticket 9665. Patch from Fábio J. Bertinatto. failure. Resolves ticket 9665. Patch from Fábio J. Bertinatto.
o Minor features (diagnostic): o Minor features (diagnostic):
- Try harder to diagnose a possible cause of bug 7164, which causes - Try harder to diagnose a possible cause of bug 7164, which causes
intermittent "microdesc_free() called but md was still referenced" intermittent "microdesc_free() called but md was still referenced"
warnings. We now log more information about the likely error case, warnings. We now log more information about the likely error case,
to try to figure out why we might be cleaning a microdescriptor to try to figure out why we might be cleaning a microdescriptor as
as old if it's still referenced by a live node. old if it's still referenced by a live node.
o Documentation: o Documentation:
- Build the torify.1 manpage again. Previously, we were only - Build the torify.1 manpage again. Previously, we were only trying
trying to build it when also building tor-fw-helper. That's why to build it when also building tor-fw-helper. That's why we didn't
we didn't notice that we'd broken the ability to build it. notice that we'd broken the ability to build it. Fixes bug 11321;
Fixes bug 11321; bugfix on 0.2.5.1-alpha. bugfix on 0.2.5.1-alpha.
- Fix the layout of the SOCKSPort flags in the manpage. Fixes bug - Fix the layout of the SOCKSPort flags in the manpage. Fixes bug
11061; bugfix on 0.2.4.7-alpha. 11061; bugfix on 0.2.4.7-alpha.
- Correctly document that we search for a system torrc file before - Correctly document that we search for a system torrc file before
looking in ~/.torrc. Fixes documentation side of 9213; bugfix looking in ~/.torrc. Fixes documentation side of 9213; bugfix on
on 0.2.3.18-rc. 0.2.3.18-rc.
- Resolve warnings from Doxygen. - Resolve warnings from Doxygen.
o Code simplifications and refactoring: o Code simplifications and refactoring:
- Removing is_internal_IP() function. Resolves ticket 4645. - Removing is_internal_IP() function. Resolves ticket 4645.
- Remove unused function circuit_dump_by_chan from circuitlist.c. Closes - Remove unused function circuit_dump_by_chan from circuitlist.c.
issue #9107; patch from "marek". Closes issue #9107; patch from "marek".
- Change our use of the ENUM_BF macro to avoid declarations that - Change our use of the ENUM_BF macro to avoid declarations that
confuse Doxygen. confuse Doxygen.
@ -275,8 +275,8 @@ Changes in version 0.2.5.4-alpha - 2014-04-??
Patch from Dana Koch. Patch from Dana Koch.
o Removed code: o Removed code:
- Remove all code for the long unused v1 directory protocol. Resolves - Remove all code for the long unused v1 directory protocol.
ticket 11070. Resolves ticket 11070.

141
contrib/format_changelog.py Executable file
View File

@ -0,0 +1,141 @@
#!/usr/bin/python
# Copyright (c) 2014, The Tor Project, Inc.
# See LICENSE for licensing information
#
# This script reformats a section of the changelog to wrap everything to
# the right width and put blank lines in the right places. Eventually,
# it might include a linter.
#
# To run it, pipe a section of the changelog (starting with "Changes
# in Tor 0.x.y.z-alpha" through the script.)
import re
import sys
import textwrap
TP_MAINHEAD = 0
TP_HEADTEXT = 1
TP_BLANK = 2
TP_SECHEAD = 3
TP_ITEMFIRST = 4
TP_ITEMBODY = 5
def head_parser(line):
if re.match(r'^[A-Z]', line):
return TP_MAINHEAD
elif re.match(r'^ o ', line):
return TP_SECHEAD
elif re.match(r'^\s*$', line):
return TP_BLANK
else:
return TP_HEADTEXT
def body_parser(line):
if re.match(r'^ o ', line):
return TP_SECHEAD
elif re.match(r'^ -',line):
return TP_ITEMFIRST
elif re.match(r'^ \S', line):
return TP_ITEMBODY
elif re.match(r'^\s*$', line):
return TP_BLANK
else:
print "Weird line %r"%line
class ChangeLog(object):
def __init__(self):
self.mainhead = None
self.headtext = []
self.curgraf = None
self.sections = []
self.cursection = None
self.lineno = 0
def addLine(self, tp, line):
self.lineno += 1
if tp == TP_MAINHEAD:
assert not self.mainhead
self.mainhead = line
elif tp == TP_HEADTEXT:
if self.curgraf is None:
self.curgraf = []
self.headtext.append(self.curgraf)
self.curgraf.append(line)
elif tp == TP_BLANK:
self.curgraf = None
elif tp == TP_SECHEAD:
self.cursection = [ self.lineno, line, [] ]
self.sections.append(self.cursection)
elif tp == TP_ITEMFIRST:
item = ( self.lineno, [ [line] ])
self.curgraf = item[1][0]
self.cursection[2].append(item)
elif tp == TP_ITEMBODY:
if self.curgraf is None:
self.curgraf = []
self.cursection[2][1][-1].append(self.curgraf)
self.curgraf.append(line)
else:
assert "This" is "unreachable"
def lint_head(self, line, head):
m = re.match(r'^ *o ([^\(]+)((?:\([^\)]+\))?):', head)
if not m:
print >>sys.stderr, "Weird header format on line %s"%line
def lint_item(self, line, grafs, head_type):
pass
def lint(self):
self.head_lines = {}
for sec_line, sec_head, items in self.sections:
head_type = self.lint_head(sec_line, sec_head)
for item_line, grafs in items:
self.lint_item(item_line, grafs, head_type)
def dumpGraf(self,par,indent1,indent2=-1):
if indent2 == -1:
indent2 = indent1
text = " ".join(re.sub(r'\s+', ' ', line.strip()) for line in par)
print textwrap.fill(text, width=72,
initial_indent=" "*indent1,
subsequent_indent=" "*indent2)
def dump(self):
print self.mainhead
for par in self.headtext:
self.dumpGraf(par, 2)
print
for _,head,items in self.sections:
if not head.endswith(':'):
print >>sys.stderr, "adding : to %r"%head
head = head + ":"
print head
for _,grafs in items:
self.dumpGraf(grafs[0],4,6)
for par in grafs[1:]:
print
self.dumpGraf(par,6,6)
print
print
CL = ChangeLog()
parser = head_parser
for line in sys.stdin:
line = line.rstrip()
tp = parser(line)
CL.addLine(tp,line)
if tp == TP_SECHEAD:
parser = body_parser
CL.lint()
CL.dump()