diff --git a/.gitignore b/.gitignore index cfb6a83..a8903c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1 @@ -/waitress-0.8.2.tar.gz -/waitress-0.8.3.tar.gz -/waitress-0.8.4.tar.gz -/waitress-0.8.5.tar.gz -/waitress-0.8.8.tar.gz -/waitress-0.8.9.tar.gz -/waitress-0.8.10.tar.gz -/waitress-0.9.0b0.tar.gz -/waitress-0.9.0b1.tar.gz -/waitress-0.9.0.tar.gz -/waitress-1.0.0.tar.gz -/waitress-1.0.1.tar.gz -/waitress-1.0.2.tar.gz -/waitress-1.1.0.tar.gz -/v1.2.1.tar.gz -/v1.2.1-nodocs.tar.gz -/v1.3.1-nodocs.tar.gz -/v1.4.0.tar.gz -/v1.4.0-nodocs.tar.gz -/v1.4.1.tar.gz -/v1.4.1-nodocs.tar.gz -/v1.4.2.tar.gz -/v1.4.2-nodocs.tar.gz -/v1.4.3.tar.gz -/v1.4.3-nodocs.tar.gz -/v1.4.4-nodocs.tar.gz +/waitress-*-nodocs.tar.gz diff --git a/0001-This-patch-is-a-backport-of-commit-e75b0d9.patch b/0001-This-patch-is-a-backport-of-commit-e75b0d9.patch deleted file mode 100644 index 85ef8de..0000000 --- a/0001-This-patch-is-a-backport-of-commit-e75b0d9.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 95f9f188665618759d8d1a27c96b3dacc3ed89be Mon Sep 17 00:00:00 2001 -From: Renata Ravanelli -Date: Fri, 15 Sep 2023 12:22:48 -0300 -Subject: [PATCH 1/6] This patch is a backport of commit: e75b0d9 - -From: Bert JW Regeer -Date: Sat, 12 Mar 2022 18:30:30 -0700 -Subject: [PATCH 1/8] Add new regular expressions for Chunked Encoding - -This also moves some regular expressions for QUOTED_PAIR/QUOTED_STRING -into this module from utilities so that they may be reused. - -Backport: -* Patch refresh - no functional change. - -Signed-off-by: Renata Ravanelli ---- - src/waitress/rfc7230.py | 27 ++++++++++++++++++++++++++- - src/waitress/utilities.py | 28 +++------------------------- - 2 files changed, 29 insertions(+), 26 deletions(-) - -diff --git a/src/waitress/rfc7230.py b/src/waitress/rfc7230.py -index cd33c90..0b76a38 100644 ---- a/src/waitress/rfc7230.py -+++ b/src/waitress/rfc7230.py -@@ -7,6 +7,9 @@ import re - - from .compat import tobytes - -+HEXDIG = "[0-9a-fA-F]" -+DIGIT = "[0-9]" -+ - WS = "[ \t]" - OWS = WS + "{0,}?" - RWS = WS + "{1,}?" -@@ -27,6 +30,12 @@ TOKEN = TCHAR + "{1,}" - # ; visible (printing) characters - VCHAR = r"\x21-\x7e" - -+# The '\\' between \x5b and \x5d is needed to escape \x5d (']') -+QDTEXT = "[\t \x21\x23-\x5b\\\x5d-\x7e" + OBS_TEXT + "]" -+ -+QUOTED_PAIR = r"\\" + "([\t " + VCHAR + OBS_TEXT + "])" -+QUOTED_STRING = '"(?:(?:' + QDTEXT + ")|(?:" + QUOTED_PAIR + '))*"' -+ - # header-field = field-name ":" OWS field-value OWS - # field-name = token - # field-value = *( field-content / obs-fold ) -@@ -45,8 +54,24 @@ FIELD_CONTENT = FIELD_VCHAR + "+(?:[ \t]+" + FIELD_VCHAR + "+)*" - # Which allows the field value here to just see if there is even a value in the first place - FIELD_VALUE = "(?:" + FIELD_CONTENT + ")?" - --HEADER_FIELD = re.compile( -+# chunk-ext = *( ";" chunk-ext-name [ "=" chunk-ext-val ] ) -+# chunk-ext-name = token -+# chunk-ext-val = token / quoted-string -+ -+CHUNK_EXT_NAME = TOKEN -+CHUNK_EXT_VAL = "(?:" + TOKEN + ")|(?:" + QUOTED_STRING + ")" -+CHUNK_EXT = ( -+ "(?:;(?P" + CHUNK_EXT_NAME + ")(?:=(?P" + CHUNK_EXT_VAL + "))?)*" -+) -+ -+# Pre-compiled regular expressions for use elsewhere -+ONLY_HEXDIG_RE = re.compile(("^" + HEXDIG + "+$").encode("latin-1")) -+ONLY_DIGIT_RE = re.compile(("^" + DIGIT + "+$").encode("latin-1")) -+HEADER_FIELD_RE = re.compile( - tobytes( - "^(?P" + TOKEN + "):" + OWS + "(?P" + FIELD_VALUE + ")" + OWS + "$" - ) - ) -+QUOTED_PAIR_RE = re.compile(QUOTED_PAIR) -+QUOTED_STRING_RE = re.compile(QUOTED_STRING) -+CHUNK_EXT_RE = re.compile(("^" + CHUNK_EXT + "$").encode("latin-1")) -diff --git a/src/waitress/utilities.py b/src/waitress/utilities.py -index 556bed2..fa59657 100644 ---- a/src/waitress/utilities.py -+++ b/src/waitress/utilities.py -@@ -22,7 +22,7 @@ import re - import stat - import time - --from .rfc7230 import OBS_TEXT, VCHAR -+from .rfc7230 import QUOTED_PAIR_RE, QUOTED_STRING_RE - - logger = logging.getLogger("waitress") - queue_logger = logging.getLogger("waitress.queue") -@@ -216,32 +216,10 @@ def parse_http_date(d): - return retval - - --# RFC 5234 Appendix B.1 "Core Rules": --# VCHAR = %x21-7E --# ; visible (printing) characters --vchar_re = VCHAR -- --# RFC 7230 Section 3.2.6 "Field Value Components": --# quoted-string = DQUOTE *( qdtext / quoted-pair ) DQUOTE --# qdtext = HTAB / SP /%x21 / %x23-5B / %x5D-7E / obs-text --# obs-text = %x80-FF --# quoted-pair = "\" ( HTAB / SP / VCHAR / obs-text ) --obs_text_re = OBS_TEXT -- --# The '\\' between \x5b and \x5d is needed to escape \x5d (']') --qdtext_re = "[\t \x21\x23-\x5b\\\x5d-\x7e" + obs_text_re + "]" -- --quoted_pair_re = r"\\" + "([\t " + vchar_re + obs_text_re + "])" --quoted_string_re = '"(?:(?:' + qdtext_re + ")|(?:" + quoted_pair_re + '))*"' -- --quoted_string = re.compile(quoted_string_re) --quoted_pair = re.compile(quoted_pair_re) -- -- - def undquote(value): - if value.startswith('"') and value.endswith('"'): - # So it claims to be DQUOTE'ed, let's validate that -- matches = quoted_string.match(value) -+ matches = QUOTED_STRING_RE.match(value) - - if matches and matches.end() == len(value): - # Remove the DQUOTE's from the value -@@ -249,7 +227,7 @@ def undquote(value): - - # Remove all backslashes that are followed by a valid vchar or - # obs-text -- value = quoted_pair.sub(r"\1", value) -+ value = QUOTED_PAIR_RE.sub(r"\1", value) - - return value - elif not value.startswith('"') and not value.endswith('"'): --- -2.39.2 (Apple Git-143) - diff --git a/0002-This-patch-is-a-backport-of-commit-1f6059f.patch b/0002-This-patch-is-a-backport-of-commit-1f6059f.patch deleted file mode 100644 index 519826c..0000000 --- a/0002-This-patch-is-a-backport-of-commit-1f6059f.patch +++ /dev/null @@ -1,108 +0,0 @@ -From c2188f39de0df7fc488703ebe0ed6e224f7be820 Mon Sep 17 00:00:00 2001 -From: Renata Ravanelli -Date: Fri, 15 Sep 2023 12:26:52 -0300 -Subject: [PATCH 2/6] This patch is a backport of commit: 1f6059f - -From: Bert JW Regeer -Date: Sat, 12 Mar 2022 18:32:24 -0700 -Subject: [PATCH] Be more strict in parsing Content-Length - -Validate that we are only parsing digits and nothing else. RFC7230 is -explicit in that the Content-Length can only exist of 1*DIGIT and may -not include any additional sign information. - -The Python int() function parses `+10` as `10` which means we were more -lenient than the standard intended. - -Backport: -* Patch refresh - no functional change. - -Signed-off-by: Renata Ravanelli ---- - src/waitress/parser.py | 11 ++++++----- - tests/test_parser.py | 24 ++++++++++++++++++++++++ - 2 files changed, 30 insertions(+), 5 deletions(-) - -diff --git a/src/waitress/parser.py b/src/waitress/parser.py -index 765fe59..4c6ebeb 100644 ---- a/src/waitress/parser.py -+++ b/src/waitress/parser.py -@@ -22,6 +22,7 @@ from io import BytesIO - from waitress.buffers import OverflowableBuffer - from waitress.compat import tostr, unquote_bytes_to_wsgi, urlparse - from waitress.receiver import ChunkedReceiver, FixedStreamReceiver -+from waitress.rfc7230 import HEADER_FIELD_RE, ONLY_DIGIT_RE - from waitress.utilities import ( - BadRequest, - RequestEntityTooLarge, -@@ -29,7 +30,6 @@ from waitress.utilities import ( - ServerNotImplemented, - find_double_newline, - ) --from .rfc7230 import HEADER_FIELD - - - class ParsingError(Exception): -@@ -209,7 +209,7 @@ class HTTPRequestParser(object): - - headers = self.headers - for line in lines: -- header = HEADER_FIELD.match(line) -+ header = HEADER_FIELD_RE.match(line) - - if not header: - raise ParsingError("Invalid header") -@@ -299,11 +299,12 @@ class HTTPRequestParser(object): - self.connection_close = True - - if not self.chunked: -- try: -- cl = int(headers.get("CONTENT_LENGTH", 0)) -- except ValueError: -+ cl = headers.get("CONTENT_LENGTH", "0") -+ -+ if not ONLY_DIGIT_RE.match(cl.encode("latin-1")): - raise ParsingError("Content-Length is invalid") - -+ cl = int(cl) - self.content_length = cl - if cl > 0: - buf = OverflowableBuffer(self.adj.inbuf_overflow) -diff --git a/tests/test_parser.py b/tests/test_parser.py -index 91837c7..eabf353 100644 ---- a/tests/test_parser.py -+++ b/tests/test_parser.py -@@ -194,6 +194,30 @@ class TestHTTPRequestParser(unittest.TestCase): - else: # pragma: nocover - self.assertTrue(False) - -+ def test_parse_header_bad_content_length_plus(self): -+ from waitress.parser import ParsingError -+ -+ data = b"GET /foobar HTTP/8.4\r\ncontent-length: +10\r\n" -+ -+ try: -+ self.parser.parse_header(data) -+ except ParsingError as e: -+ self.assertIn("Content-Length is invalid", e.args[0]) -+ else: # pragma: nocover -+ self.assertTrue(False) -+ -+ def test_parse_header_bad_content_length_minus(self): -+ from waitress.parser import ParsingError -+ -+ data = b"GET /foobar HTTP/8.4\r\ncontent-length: -10\r\n" -+ -+ try: -+ self.parser.parse_header(data) -+ except ParsingError as e: -+ self.assertIn("Content-Length is invalid", e.args[0]) -+ else: # pragma: nocover -+ self.assertTrue(False) -+ - def test_parse_header_multiple_content_length(self): - from waitress.parser import ParsingError - --- -2.39.2 (Apple Git-143) - diff --git a/0003-This-patch-is-a-backport-of-commit-884bed1.patch b/0003-This-patch-is-a-backport-of-commit-884bed1.patch deleted file mode 100644 index ca337b1..0000000 --- a/0003-This-patch-is-a-backport-of-commit-884bed1.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 82003049b2b8053d74504c4e6b3e14528a8b38ff Mon Sep 17 00:00:00 2001 -From: Renata Ravanelli -Date: Fri, 15 Sep 2023 12:32:19 -0300 -Subject: [PATCH 3/6] This patch is a backport of commit 884bed1 - -From: Bert JW Regeer -Date: Sat, 12 Mar 2022 18:35:01 -0700 -Subject: [PATCH] Update tests to remove invalid chunked encoding chunk-size - -RFC7230 states the following: - - chunk = chunk-size [ chunk-ext ] CRLF - chunk-data CRLF - chunk-size = 1*HEXDIG - -Where chunk-ext is: - - chunk-ext = *( ";" chunk-ext-name [ "=" chunk-ext-val ] ) - -Only if there is a chunk-ext should there be a `;` after the 1*HEXDIG. -And a chunk-ext that is empty is invalid. - -Backport: - * Patch refresh - no functional change. -Signed-off-by: Renata Ravanelli ---- - tests/test_functional.py | 6 +++--- - tests/test_parser.py | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/test_functional.py b/tests/test_functional.py -index e894497..7a54b22 100644 ---- a/tests/test_functional.py -+++ b/tests/test_functional.py -@@ -302,7 +302,7 @@ class EchoTests(object): - self.assertFalse("transfer-encoding" in headers) - - def test_chunking_request_with_content(self): -- control_line = b"20;\r\n" # 20 hex = 32 dec -+ control_line = b"20\r\n" # 20 hex = 32 dec - s = b"This string has 32 characters.\r\n" - expected = s * 12 - header = tobytes("GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n") -@@ -321,7 +321,7 @@ class EchoTests(object): - self.assertFalse("transfer-encoding" in headers) - - def test_broken_chunked_encoding(self): -- control_line = "20;\r\n" # 20 hex = 32 dec -+ control_line = "20\r\n" # 20 hex = 32 dec - s = "This string has 32 characters.\r\n" - to_send = "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n" - to_send += control_line + s + "\r\n" -@@ -346,7 +346,7 @@ class EchoTests(object): - self.assertRaises(ConnectionClosed, read_http, fp) - - def test_broken_chunked_encoding_missing_chunk_end(self): -- control_line = "20;\r\n" # 20 hex = 32 dec -+ control_line = "20\r\n" # 20 hex = 32 dec - s = "This string has 32 characters.\r\n" - to_send = "GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n" - to_send += control_line + s -diff --git a/tests/test_parser.py b/tests/test_parser.py -index eabf353..420f280 100644 ---- a/tests/test_parser.py -+++ b/tests/test_parser.py -@@ -152,7 +152,7 @@ class TestHTTPRequestParser(unittest.TestCase): - b"Transfer-Encoding: chunked\r\n" - b"X-Foo: 1\r\n" - b"\r\n" -- b"1d;\r\n" -+ b"1d\r\n" - b"This string has 29 characters\r\n" - b"0\r\n\r\n" - ) --- -2.39.2 (Apple Git-143) - diff --git a/0004-This-patch-is-a-backport-of-commit-d032a66.patch b/0004-This-patch-is-a-backport-of-commit-d032a66.patch deleted file mode 100644 index f45e129..0000000 --- a/0004-This-patch-is-a-backport-of-commit-d032a66.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 86a7f4d2ea10ab96a3597f64b8662fbd741e2031 Mon Sep 17 00:00:00 2001 -From: Renata Ravanelli -Date: Fri, 15 Sep 2023 12:40:31 -0300 -Subject: [PATCH 4/6] This patch is a backport of commit: d032a66 - -From: Bert JW Regeer - -Date: Sat, 12 Mar 2022 18:42:51 -0700 -Subject: [PATCH] Error when receiving back Chunk Extension - -Waitress discards chunked extensions and does no further processing on -them, however it failed to validate that the chunked encoding extension -did not contain invalid data. - -We now validate that if there are any chunked extensions that they are -well-formed, if they are not and contain invalid characters, then -Waitress will now correctly return a Bad Request and stop any further -processing of the request - -Signed-off-by: Renata Ravanelli ---- - src/waitress/receiver.py | 11 ++++++++++- - tests/test_functional.py | 22 ++++++++++++++++++++++ - tests/test_receiver.py | 37 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 69 insertions(+), 1 deletion(-) - -diff --git a/src/waitress/receiver.py b/src/waitress/receiver.py -index 5d1568d..106dbc7 100644 ---- a/src/waitress/receiver.py -+++ b/src/waitress/receiver.py -@@ -14,6 +14,7 @@ - """Data Chunk Receiver - """ - -+from waitress.rfc7230 import CHUNK_EXT_RE, ONLY_HEXDIG_RE - from waitress.utilities import BadRequest, find_double_newline - - -@@ -110,6 +111,7 @@ class ChunkedReceiver(object): - s = b"" - else: - self.chunk_end = b"" -+ - if pos == 0: - # Chop off the terminating CR LF from the chunk - s = s[2:] -@@ -140,7 +142,14 @@ class ChunkedReceiver(object): - semi = line.find(b";") - - if semi >= 0: -- # discard extension info. -+ extinfo = line[semi:] -+ valid_ext_info = CHUNK_EXT_RE.match(extinfo) -+ -+ if not valid_ext_info: -+ self.error = BadRequest("Invalid chunk extension") -+ self.all_chunks_received = True -+ -+ break - line = line[:semi] - try: - sz = int(line.strip(), 16) # hexadecimal -diff --git a/tests/test_functional.py b/tests/test_functional.py -index 7a54b22..853942c 100644 ---- a/tests/test_functional.py -+++ b/tests/test_functional.py -@@ -345,6 +345,28 @@ class EchoTests(object): - self.send_check_error(to_send) - self.assertRaises(ConnectionClosed, read_http, fp) - -+ def test_broken_chunked_encoding_invalid_extension(self): -+ control_line = b"20;invalid=\r\n" # 20 hex = 32 dec -+ s = b"This string has 32 characters.\r\n" -+ to_send = b"GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n" -+ to_send += control_line + s + b"\r\n" -+ self.connect() -+ self.sock.send(to_send) -+ with self.sock.makefile("rb", 0) as fp: -+ line, headers, response_body = read_http(fp) -+ self.assertline(line, "400", "Bad Request", "HTTP/1.1") -+ cl = int(headers["content-length"]) -+ self.assertEqual(cl, len(response_body)) -+ self.assertIn(b"Invalid chunk extension", response_body) -+ self.assertEqual( -+ sorted(headers.keys()), -+ ["connection", "content-length", "content-type", "date", "server"], -+ ) -+ self.assertEqual(headers["content-type"], "text/plain") -+ # connection has been closed -+ self.send_check_error(to_send) -+ self.assertRaises(ConnectionClosed, read_http, fp) -+ - def test_broken_chunked_encoding_missing_chunk_end(self): - control_line = "20\r\n" # 20 hex = 32 dec - s = "This string has 32 characters.\r\n" -diff --git a/tests/test_receiver.py b/tests/test_receiver.py -index b4910bb..a6261ea 100644 ---- a/tests/test_receiver.py -+++ b/tests/test_receiver.py -@@ -1,5 +1,7 @@ - import unittest - -+import pytest -+ - - class TestFixedStreamReceiver(unittest.TestCase): - def _makeOne(self, cl, buf): -@@ -226,6 +228,41 @@ class TestChunkedReceiver(unittest.TestCase): - self.assertEqual(inst.error, None) - - -+class TestChunkedReceiverParametrized: -+ def _makeOne(self, buf): -+ from waitress.receiver import ChunkedReceiver -+ -+ return ChunkedReceiver(buf) -+ -+ @pytest.mark.parametrize( -+ "invalid_extension", [b"\n", b"invalid=", b"\r", b"invalid = true"] -+ ) -+ def test_received_invalid_extensions(self, invalid_extension): -+ from waitress.utilities import BadRequest -+ -+ buf = DummyBuffer() -+ inst = self._makeOne(buf) -+ data = b"4;" + invalid_extension + b"\r\ntest\r\n" -+ result = inst.received(data) -+ assert result == len(data) -+ assert inst.error.__class__ == BadRequest -+ assert inst.error.body == "Invalid chunk extension" -+ -+ @pytest.mark.parametrize( -+ "valid_extension", [b"test", b"valid=true", b"valid=true;other=true"] -+ ) -+ def test_received_valid_extensions(self, valid_extension): -+ # While waitress may ignore extensions in Chunked Encoding, we do want -+ # to make sure that we don't fail when we do encounter one that is -+ # valid -+ buf = DummyBuffer() -+ inst = self._makeOne(buf) -+ data = b"4;" + valid_extension + b"\r\ntest\r\n" -+ result = inst.received(data) -+ assert result == len(data) -+ assert inst.error == None -+ -+ - class DummyBuffer(object): - def __init__(self, data=None): - if data is None: --- -2.39.2 (Apple Git-143) - diff --git a/0005-This-patch-is-a-backport-of-commit-d9bdfa0.patch b/0005-This-patch-is-a-backport-of-commit-d9bdfa0.patch deleted file mode 100644 index 2f008b0..0000000 --- a/0005-This-patch-is-a-backport-of-commit-d9bdfa0.patch +++ /dev/null @@ -1,116 +0,0 @@ -From b0ae7e3e156ac6f4a30ac4a54af0bffb707b008d Mon Sep 17 00:00:00 2001 -From: Renata Ravanelli -Date: Fri, 15 Sep 2023 12:41:06 -0300 -Subject: [PATCH 5/6] This patch is a backport of commit d9bdfa0 - -From: Bert JW Regeer -Date: Sat, 12 Mar 2022 18:48:26 -0700 -Subject: [PATCH] Validate chunk size in Chunked Encoding are HEXDIG - -RFC7230 states that a chunk-size should be 1*HEXDIG, this is now -validated before passing the resulting string to int() which would also -parse other formats for hex, such as: `0x01` as `1` and `+0x01` as `1`. -This would lead to a potential for a frontend proxy server and waitress -to disagree on where a chunk started and ended, thereby potentially -leading to request smuggling. - -With the increased validation if the size is not just hex digits, -Waitress now returns a Bad Request and stops processing the request. - -Signed-off-by: Renata Ravanelli ---- - src/waitress/receiver.py | 19 ++++++++++++++----- - tests/test_functional.py | 22 ++++++++++++++++++++++ - tests/test_receiver.py | 12 ++++++++++++ - 3 files changed, 48 insertions(+), 5 deletions(-) - -diff --git a/src/waitress/receiver.py b/src/waitress/receiver.py -index 106dbc7..9e4bffe 100644 ---- a/src/waitress/receiver.py -+++ b/src/waitress/receiver.py -@@ -150,12 +150,21 @@ class ChunkedReceiver(object): - self.all_chunks_received = True - - break -+ - line = line[:semi] -- try: -- sz = int(line.strip(), 16) # hexadecimal -- except ValueError: # garbage in input -- self.error = BadRequest("garbage in chunked encoding input") -- sz = 0 -+ -+ # Remove any whitespace -+ line = line.strip() -+ -+ if not ONLY_HEXDIG_RE.match(line): -+ self.error = BadRequest("Invalid chunk size") -+ self.all_chunks_received = True -+ -+ break -+ -+ # Can not fail due to matching against the regular -+ # expression above -+ sz = int(line.strip(), 16) # hexadecimal - - if sz > 0: - # Start a new chunk. -diff --git a/tests/test_functional.py b/tests/test_functional.py -index 853942c..448e0c0 100644 ---- a/tests/test_functional.py -+++ b/tests/test_functional.py -@@ -345,6 +345,28 @@ class EchoTests(object): - self.send_check_error(to_send) - self.assertRaises(ConnectionClosed, read_http, fp) - -+ def test_broken_chunked_encoding_invalid_hex(self): -+ control_line = b"0x20\r\n" # 20 hex = 32 dec -+ s = b"This string has 32 characters.\r\n" -+ to_send = b"GET / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n" -+ to_send += control_line + s + b"\r\n" -+ self.connect() -+ self.sock.send(to_send) -+ with self.sock.makefile("rb", 0) as fp: -+ line, headers, response_body = read_http(fp) -+ self.assertline(line, "400", "Bad Request", "HTTP/1.1") -+ cl = int(headers["content-length"]) -+ self.assertEqual(cl, len(response_body)) -+ self.assertIn(b"Invalid chunk size", response_body) -+ self.assertEqual( -+ sorted(headers.keys()), -+ ["connection", "content-length", "content-type", "date", "server"], -+ ) -+ self.assertEqual(headers["content-type"], "text/plain") -+ # connection has been closed -+ self.send_check_error(to_send) -+ self.assertRaises(ConnectionClosed, read_http, fp) -+ - def test_broken_chunked_encoding_invalid_extension(self): - control_line = b"20;invalid=\r\n" # 20 hex = 32 dec - s = b"This string has 32 characters.\r\n" -diff --git a/tests/test_receiver.py b/tests/test_receiver.py -index a6261ea..17328d4 100644 ---- a/tests/test_receiver.py -+++ b/tests/test_receiver.py -@@ -262,6 +262,18 @@ class TestChunkedReceiverParametrized: - assert result == len(data) - assert inst.error == None - -+ @pytest.mark.parametrize("invalid_size", [b"0x04", b"+0x04", b"x04", b"+04"]) -+ def test_received_invalid_size(self, invalid_size): -+ from waitress.utilities import BadRequest -+ -+ buf = DummyBuffer() -+ inst = self._makeOne(buf) -+ data = invalid_size + b"\r\ntest\r\n" -+ result = inst.received(data) -+ assert result == len(data) -+ assert inst.error.__class__ == BadRequest -+ assert inst.error.body == "Invalid chunk size" -+ - - class DummyBuffer(object): - def __init__(self, data=None): --- -2.39.2 (Apple Git-143) - diff --git a/0006-This-patch-is-a-backport-of-commit-bd22869.patch b/0006-This-patch-is-a-backport-of-commit-bd22869.patch deleted file mode 100644 index 0655e80..0000000 --- a/0006-This-patch-is-a-backport-of-commit-bd22869.patch +++ /dev/null @@ -1,74 +0,0 @@ -From ef0b3d7cb9f532c062052082f71174ef94d4a3e3 Mon Sep 17 00:00:00 2001 -From: Renata Ravanelli -Date: Fri, 15 Sep 2023 12:41:52 -0300 -Subject: [PATCH 6/6] This patch is a backport of commit bd22869 - -From bd22869 Mon Sep 17 00:00:00 2001 -From: Bert JW Regeer -Date: Sat, 12 Mar 2022 19:16:23 -0700 -Subject: [PATCH] Remove extraneous calls to .strip() in Chunked Encoding - -To be valid chunked encoding we should not be removing any whitespace as -the standard does not allow for optional whitespace. - -If whitespace is encountered in the wrong place, it should lead to a 400 -Bad Request instead. - -Backport: - * Patch refresh - no functional change. - -Signed-off-by: Renata Ravanelli ---- - src/waitress/receiver.py | 6 +----- - tests/test_receiver.py | 4 +++- - 2 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/src/waitress/receiver.py b/src/waitress/receiver.py -index 9e4bffe..806ff87 100644 ---- a/src/waitress/receiver.py -+++ b/src/waitress/receiver.py -@@ -135,7 +135,6 @@ class ChunkedReceiver(object): - line = s[:pos] - s = s[pos + 2 :] - self.control_line = b"" -- line = line.strip() - - if line: - # Begin a new chunk. -@@ -153,9 +152,6 @@ class ChunkedReceiver(object): - - line = line[:semi] - -- # Remove any whitespace -- line = line.strip() -- - if not ONLY_HEXDIG_RE.match(line): - self.error = BadRequest("Invalid chunk size") - self.all_chunks_received = True -@@ -164,7 +160,7 @@ class ChunkedReceiver(object): - - # Can not fail due to matching against the regular - # expression above -- sz = int(line.strip(), 16) # hexadecimal -+ sz = int(line, 16) # hexadecimal - - if sz > 0: - # Start a new chunk. -diff --git a/tests/test_receiver.py b/tests/test_receiver.py -index 17328d4..014f785 100644 ---- a/tests/test_receiver.py -+++ b/tests/test_receiver.py -@@ -262,7 +262,9 @@ class TestChunkedReceiverParametrized: - assert result == len(data) - assert inst.error == None - -- @pytest.mark.parametrize("invalid_size", [b"0x04", b"+0x04", b"x04", b"+04"]) -+ @pytest.mark.parametrize( -+ "invalid_size", [b"0x04", b"+0x04", b"x04", b"+04", b" 04", b" 0x04"] -+ ) - def test_received_invalid_size(self, invalid_size): - from waitress.utilities import BadRequest - --- -2.39.2 (Apple Git-143) - diff --git a/changelog b/changelog new file mode 100644 index 0000000..a60d365 --- /dev/null +++ b/changelog @@ -0,0 +1,208 @@ +* Fri Jan 26 2024 Fedora Release Engineering - 2.1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 2.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 2.1.2-4 +- Rebuilt for Python 3.12 + +* Wed May 10 2023 Carl George - 2.1.2-3 +- Convert to pyproject macros +- Run test suite +- Switch to SPDX license identifier + +* Fri Jan 20 2023 Fedora Release Engineering - 2.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Aug 02 2022 Alfredo Moralejo - 2.1.2-1 +- Update to 2.1.2 Fixes rhbz#2091729 + +* Fri Jul 22 2022 Fedora Release Engineering - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 2.1.1-2 +- Rebuilt for Python 3.11 + +* Mon May 30 2022 Kevin Fenzi - 2.1.1-1 +- Update to 2.1.1. Fixes rhbz#2051348 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.4.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 03 2021 Python Maint - 1.4.4-4 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 15 2021 Troy Dawson - 1.4.4-2 +- Remove test BuildRequires until tests are working + +* Thu Sep 10 2020 Joel Capitao - 1.4.4-1 +- Update to 1.4.4 + +* Wed Jul 29 2020 Fedora Release Engineering - 1.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 23 2020 Miro Hrončok - 1.4.3-2 +- Rebuilt for Python 3.9 + +* Fri Feb 07 2020 Lorenzo Gil Sanchez - 1.4.3-1 +- Update to 1.4.3 Fixes bug #1785591 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 20 2020 Lorenzo Gil Sanchez - 1.4.2-1 +- Update to 1.4.2 Fixes bugs #1785591 #1789807 #1789809 #1789810 #1791415 + #1791416 #1791417 #1791420 #1791421 #1791422 #1791423 + +* Thu Jan 16 2020 Lorenzo Gil Sanchez - 1.4.1-1 +- Update to 1.4.1 Fixes bug #1785591 + +* Wed Dec 25 2019 Lorenzo Gil Sanchez - 1.4.0-1 +- Update to 1.4.0 Fixes bug #1785591 + +* Sun Oct 06 2019 Kevin Fenzi - 1.3.1-1 +- Update to 1.3.1. Fixes bug #1747075 + +* Mon Sep 09 2019 Miro Hrončok - 1.2.1-5 +- Subpackage python2-waitress has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Sat Aug 17 2019 Miro Hrončok - 1.2.1-4 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jun 29 2019 Kevin Fenzi - 1.2.1-2 +- Remove non free docs from src.rpm and provide script to do so before upload. +- Fixes bug #1684335 + +* Tue Feb 05 2019 Lorenzo Gil Sanchez - 1.2.1-1 +- Update to 1.2.1 (#1667466) + +* Sat Feb 02 2019 Fedora Release Engineering - 1.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Jun 17 2018 Miro Hrončok - 1.1.0-3 +- Rebuilt for Python 3.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Nov 11 2017 Lorenzo Gil Sanchez - 1.1.0-1 +- Update to 1.1.0 (#1504455) + +* Thu Jul 27 2017 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 18 2017 Lorenzo Gil Sanchez - 1.0.2-1 +- Update to 1.0.2. Fixes bug #1419297 + +* Sat Feb 11 2017 Fedora Release Engineering - 1.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.0.1-2 +- Rebuild for Python 3.6 + +* Tue Oct 25 2016 Kevin Fenzi - 1.0.1-1 +- Update to 1.0.1. Fixes bug #1387885 + +* Sat Sep 03 2016 Kevin Fenzi - 1.0.0-1 +- Update to 1.0.0. Fixes bug #1372330 + +* Tue Jul 19 2016 Fedora Release Engineering - 0.9.0-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Jun 29 2016 Igor Gnatenko - 0.9.0-3 +- Modernize spec to comply with new packaging guidelines + +* Thu May 26 2016 Lorenzo Gil Sanchez - 0.9.0-2 +- Fixed Source0 to point to new PyPi predictable URL format + +* Thu May 5 2016 Lorenzo Gil Sanchez - 0.9.0-1 +- Update to 0.9.0 +- Fixed 2 warnings from fedpkg lint + +* Sun Apr 10 2016 Kevin Fenzi - 0.9.0b1-1 +- Update to 0.9.0b1. Fixes bug #1325661 + +* Mon Mar 21 2016 Lorenzo Gil Sanchez - 0.9.0b0-1 +- New (beta) version + +* Thu Feb 04 2016 Fedora Release Engineering - 0.8.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 0.8.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Wed Sep 16 2015 Ralph Bean - 0.8.10-1 +- new version + +* Thu Jun 18 2015 Fedora Release Engineering - 0.8.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Apr 27 2015 Ralph Bean - 0.8.9-5 +- Conditionalize the python3 subpackage. + +* Mon Jul 14 2014 Lorenzo Gil Sanchez - 0.8.9-4 +- Fix comment in description section about versioned directory for docs +- Use __python2 macro instead of __python + +* Sat Jun 14 2014 Lorenzo Gil Sanchez - 0.8.9-3 +- Run the tests with nose to avoid unclosed socket errors + +* Sun Jun 08 2014 Fedora Release Engineering - 0.8.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun May 25 2014 Lorenzo Gil Sanchez - 0.8.9-1 +- Update to upstream + +* Wed May 14 2014 Bohuslav Kabrda - 0.8.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Sun Dec 22 2013 Lorenzo Gil Sanchez - 0.8.8-1 +- Update to upstream + +* Sun Dec 8 2013 Lorenzo Gil Sanchez - 0.8.5-3 +- Remove python3 dependency on the python-waitress python2 package + +* Wed Aug 7 2013 Lorenzo Gil Sanchez - 0.8.5-2 +- Update description to use the new Fedora 20 _pkgdocdir macro, which + is also defined for backwards cmompatibility + +* Wed Jul 31 2013 Lorenzo Gil Sanchez - 0.8.5-1 +- Update to upstream + +* Sat Jul 6 2013 Lorenzo Gil Sanchez - 0.8.4-1 +- Update to upstream +- Added waitress-serve as a binary executable in /usr/bin + +* Sun May 12 2013 Lorenzo Gil Sanchez - 0.8.3-1 +- Update to upstream + +* Thu Feb 14 2013 Fedora Release Engineering - 0.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Nov 28 2012 Lorenzo Gil Sanchez - 0.8.2-3 +- Use version macro in the Source0 to avoid duplicates +* Sat Nov 24 2012 Lorenzo Gil Sanchez - 0.8.2-2 +- Point to the local docs directory in the description for the documentation +- Remove py3dir before copying the files to it in the prep phase +- Remove -O1 in the build phase as it is not used anymore in the Fedora + Packaging guidelines +- Remove files rpmlint doesn't like +* Mon Nov 19 2012 Lorenzo Gil Sanchez - 0.8.2-1 +- New package. diff --git a/generate-tarball.sh b/generate-tarball.sh index f45f570..d6b0ffa 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -1,8 +1,14 @@ -#!/bin/sh +#!/bin/bash + +if [[ $# -ne 1 ]]; then + echo "usage: $(basename $0) " + exit 1 +fi VERSION=$1 -tar -xzvf v$VERSION.tar.gz +wget https://github.com/Pylons/waitress/archive/v$VERSION/waitress-$VERSION.tar.gz +tar -xzvf waitress-$VERSION.tar.gz rm -rf waitress-$VERSION/docs mv waitress-$VERSION waitress-$VERSION-nodocs -tar -czvf v$VERSION-nodocs.tar.gz waitress-$VERSION-nodocs +tar -czvf waitress-$VERSION-nodocs.tar.gz waitress-$VERSION-nodocs diff --git a/python-waitress.spec b/python-waitress.spec index 66a8c6d..dd52e38 100644 --- a/python-waitress.spec +++ b/python-waitress.spec @@ -1,12 +1,15 @@ Name: python-waitress -Version: 1.4.4 -Release: 8%{?dist} +Version: 3.0.2 +Release: %autorelease Summary: Waitress WSGI server License: ZPL-2.1 URL: https://github.com/Pylons/waitress -Source0: v%{version}-nodocs.tar.gz +Source0: waitress-%{version}-nodocs.tar.gz # Upstream ships non free docs files. +# +# https://github.com/Pylons/waitress/issues/78 +# # We do not even want them in our src.rpms # So we remove them before uploading. # @@ -16,23 +19,12 @@ Source0: v%{version}-nodocs.tar.gz # Source1: generate-tarball.sh -# These patches are backports based on RHEL patch #923591398b8553c7ba295dfede592671b653f946 - -Patch1: 0001-This-patch-is-a-backport-of-commit-e75b0d9.patch -Patch2: 0002-This-patch-is-a-backport-of-commit-1f6059f.patch -Patch3: 0003-This-patch-is-a-backport-of-commit-884bed1.patch -Patch4: 0004-This-patch-is-a-backport-of-commit-d032a66.patch -Patch5: 0005-This-patch-is-a-backport-of-commit-d9bdfa0.patch -Patch6: 0006-This-patch-is-a-backport-of-commit-bd22869.patch - BuildArch: noarch %global _description %{expand: -Waitress is meant to be a production-quality pure-Python WSGI server with very -acceptable performance. It has no dependencies except ones which live in the -Python standard library. It runs on CPython on Unix and Windows under Python -2.7+ and Python 3.5+. It is also known to run on PyPy 1.6.0+ on UNIX. It -supports HTTP/1.0 and HTTP/1.1.} +Waitress is a production-quality pure-Python WSGI server with very acceptable +performance. It has no dependencies except ones which live in the Python +standard library.} %description %{_description} @@ -43,8 +35,8 @@ BuildRequires: python3-devel %description -n python3-waitress %{_description} %prep -%autosetup -n waitress-%{version}-nodocs -p 1 -sed -e '/pytest-cover/d' \ +%autosetup -n waitress-%{version}-nodocs +sed -e '/pytest-cov/d' \ -e '/coverage/d' \ -e '/addopts/d' \ -i setup.cfg @@ -57,198 +49,14 @@ sed -e '/pytest-cover/d' \ %install %pyproject_install -%pyproject_save_files waitress +%pyproject_save_files -l waitress %check %pytest %files -n python3-waitress -f %{pyproject_files} -%license COPYRIGHT.txt LICENSE.txt %doc README.rst CHANGES.txt %{_bindir}/waitress-serve %changelog -* Fri Jul 21 2023 Renata Ravanelli - 1.4.4-8 -- Backport changes to fix CVE-2022-24761 - -* Wed May 10 2023 Carl George - 1.4.4-7 -- Convert to pyproject macros -- Run test suite -- Switch to SPDX license identifier - -* Fri Jan 21 2022 Fedora Release Engineering - 1.4.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.4.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 03 2021 Python Maint - 1.4.4-4 -- Rebuilt for Python 3.10 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 15 2021 Troy Dawson - 1.4.4-2 -- Remove test BuildRequires until tests are working - -* Thu Sep 10 2020 Joel Capitao - 1.4.4-1 -- Update to 1.4.4 - -* Wed Jul 29 2020 Fedora Release Engineering - 1.4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat May 23 2020 Miro Hrončok - 1.4.3-2 -- Rebuilt for Python 3.9 - -* Fri Feb 07 2020 Lorenzo Gil Sanchez - 1.4.3-1 -- Update to 1.4.3 Fixes bug #1785591 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jan 20 2020 Lorenzo Gil Sanchez - 1.4.2-1 -- Update to 1.4.2 Fixes bugs #1785591 #1789807 #1789809 #1789810 #1791415 - #1791416 #1791417 #1791420 #1791421 #1791422 #1791423 - -* Thu Jan 16 2020 Lorenzo Gil Sanchez - 1.4.1-1 -- Update to 1.4.1 Fixes bug #1785591 - -* Wed Dec 25 2019 Lorenzo Gil Sanchez - 1.4.0-1 -- Update to 1.4.0 Fixes bug #1785591 - -* Sun Oct 06 2019 Kevin Fenzi - 1.3.1-1 -- Update to 1.3.1. Fixes bug #1747075 - -* Mon Sep 09 2019 Miro Hrončok - 1.2.1-5 -- Subpackage python2-waitress has been removed - See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal - -* Sat Aug 17 2019 Miro Hrončok - 1.2.1-4 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Jun 29 2019 Kevin Fenzi - 1.2.1-2 -- Remove non free docs from src.rpm and provide script to do so before upload. -- Fixes bug #1684335 - -* Tue Feb 05 2019 Lorenzo Gil Sanchez - 1.2.1-1 -- Update to 1.2.1 (#1667466) - -* Sat Feb 02 2019 Fedora Release Engineering - 1.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Jun 17 2018 Miro Hrončok - 1.1.0-3 -- Rebuilt for Python 3.7 - -* Fri Feb 09 2018 Fedora Release Engineering - 1.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Nov 11 2017 Lorenzo Gil Sanchez - 1.1.0-1 -- Update to 1.1.0 (#1504455) - -* Thu Jul 27 2017 Fedora Release Engineering - 1.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 18 2017 Lorenzo Gil Sanchez - 1.0.2-1 -- Update to 1.0.2. Fixes bug #1419297 - -* Sat Feb 11 2017 Fedora Release Engineering - 1.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 1.0.1-2 -- Rebuild for Python 3.6 - -* Tue Oct 25 2016 Kevin Fenzi - 1.0.1-1 -- Update to 1.0.1. Fixes bug #1387885 - -* Sat Sep 03 2016 Kevin Fenzi - 1.0.0-1 -- Update to 1.0.0. Fixes bug #1372330 - -* Tue Jul 19 2016 Fedora Release Engineering - 0.9.0-4 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed Jun 29 2016 Igor Gnatenko - 0.9.0-3 -- Modernize spec to comply with new packaging guidelines - -* Thu May 26 2016 Lorenzo Gil Sanchez - 0.9.0-2 -- Fixed Source0 to point to new PyPi predictable URL format - -* Thu May 5 2016 Lorenzo Gil Sanchez - 0.9.0-1 -- Update to 0.9.0 -- Fixed 2 warnings from fedpkg lint - -* Sun Apr 10 2016 Kevin Fenzi - 0.9.0b1-1 -- Update to 0.9.0b1. Fixes bug #1325661 - -* Mon Mar 21 2016 Lorenzo Gil Sanchez - 0.9.0b0-1 -- New (beta) version - -* Thu Feb 04 2016 Fedora Release Engineering - 0.8.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 10 2015 Fedora Release Engineering - 0.8.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Wed Sep 16 2015 Ralph Bean - 0.8.10-1 -- new version - -* Thu Jun 18 2015 Fedora Release Engineering - 0.8.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 27 2015 Ralph Bean - 0.8.9-5 -- Conditionalize the python3 subpackage. - -* Mon Jul 14 2014 Lorenzo Gil Sanchez - 0.8.9-4 -- Fix comment in description section about versioned directory for docs -- Use __python2 macro instead of __python - -* Sat Jun 14 2014 Lorenzo Gil Sanchez - 0.8.9-3 -- Run the tests with nose to avoid unclosed socket errors - -* Sun Jun 08 2014 Fedora Release Engineering - 0.8.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun May 25 2014 Lorenzo Gil Sanchez - 0.8.9-1 -- Update to upstream - -* Wed May 14 2014 Bohuslav Kabrda - 0.8.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 - -* Sun Dec 22 2013 Lorenzo Gil Sanchez - 0.8.8-1 -- Update to upstream - -* Sun Dec 8 2013 Lorenzo Gil Sanchez - 0.8.5-3 -- Remove python3 dependency on the python-waitress python2 package - -* Wed Aug 7 2013 Lorenzo Gil Sanchez - 0.8.5-2 -- Update description to use the new Fedora 20 _pkgdocdir macro, which - is also defined for backwards cmompatibility - -* Wed Jul 31 2013 Lorenzo Gil Sanchez - 0.8.5-1 -- Update to upstream - -* Sat Jul 6 2013 Lorenzo Gil Sanchez - 0.8.4-1 -- Update to upstream -- Added waitress-serve as a binary executable in /usr/bin - -* Sun May 12 2013 Lorenzo Gil Sanchez - 0.8.3-1 -- Update to upstream - -* Thu Feb 14 2013 Fedora Release Engineering - 0.8.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Nov 28 2012 Lorenzo Gil Sanchez - 0.8.2-3 -- Use version macro in the Source0 to avoid duplicates -* Sat Nov 24 2012 Lorenzo Gil Sanchez - 0.8.2-2 -- Point to the local docs directory in the description for the documentation -- Remove py3dir before copying the files to it in the prep phase -- Remove -O1 in the build phase as it is not used anymore in the Fedora - Packaging guidelines -- Remove files rpmlint doesn't like -* Mon Nov 19 2012 Lorenzo Gil Sanchez - 0.8.2-1 -- New package. +%autochangelog diff --git a/sources b/sources index 859cafd..cc9417c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.4.4-nodocs.tar.gz) = 246e066774f093caf174c2e7a054fedf9d09ce871524f6fdfd86bade89b858ff28ea0fd7347874303e473bf2527919beecc174264d5d8283030ab13c5942ef2d +SHA512 (waitress-3.0.2-nodocs.tar.gz) = bd200adf775a5f2a64c5b855ae64b7ada191eed91f10265701b404ad026af47c3f9e0b2d07f2615a6f6abcbc01b3ae2eb02d4c978b060b560ce60991d9590435