From bfaec6c7fdc0b905a4d24372a932adf45c3e60b0 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 23 Nov 2016 01:56:49 +0000
Subject: [PATCH] proposals 129, 130

---
 .../spec/proposals/129-blocklist-newsxml.rst  | 57 ++++++++++++++++++
 i2p2www/spec/proposals/130-blocklist-su3.rst  | 60 +++++++++++++++++++
 2 files changed, 117 insertions(+)
 create mode 100644 i2p2www/spec/proposals/129-blocklist-newsxml.rst
 create mode 100644 i2p2www/spec/proposals/130-blocklist-su3.rst

diff --git a/i2p2www/spec/proposals/129-blocklist-newsxml.rst b/i2p2www/spec/proposals/129-blocklist-newsxml.rst
new file mode 100644
index 000000000..f11ffb57c
--- /dev/null
+++ b/i2p2www/spec/proposals/129-blocklist-newsxml.rst
@@ -0,0 +1,57 @@
+======================
+Blocklist in News Feed
+======================
+.. meta::
+    :author: zzz
+    :created: 2016-11-23
+    :thread: http://zzz.i2p/topics/2191
+    :lastupdated: 2016-11-23
+    :status: Open
+
+.. contents::
+
+
+Overview
+========
+
+This proposal is to distribute blocklist updates in the news file.
+
+
+Motivation
+==========
+
+Without this, the blocklist is only updated in the release.
+Uses existing news subscription.
+This format could be used in various router implementations, but only the Java router
+uses the news subscription now.
+
+
+Design
+======
+
+Add a new section to the news.xml.
+Allow blocking by IP or router hash.
+Include a signature of the section, to be specified.
+The signature must be verifed on import.
+
+
+Specification
+=============
+
+To be added to the router update specification page.
+
+Entries are either a literal IPv4 or IPv6 address,
+or a 44-character base64-encoded router hash.
+Support for blocking with a net mask, e.g. x.y.0.0/16, is optional.
+
+
+Migration
+=========
+
+Routers that don't support this will ignore the new XML section.
+
+
+See Also
+========
+
+Proposal 130
diff --git a/i2p2www/spec/proposals/130-blocklist-su3.rst b/i2p2www/spec/proposals/130-blocklist-su3.rst
new file mode 100644
index 000000000..7af6a73d4
--- /dev/null
+++ b/i2p2www/spec/proposals/130-blocklist-su3.rst
@@ -0,0 +1,60 @@
+=======================
+Blocklist in SU3 Format
+=======================
+.. meta::
+    :author: psi,zzz
+    :created: 2016-11-23
+    :thread: http://zzz.i2p/topics/2192
+    :lastupdated: 2016-11-23
+    :status: Open
+
+.. contents::
+
+
+Overview
+========
+
+This proposal is to distribute blocklist updates in a separate su3 file.
+
+
+Motivation
+==========
+
+Without this, the blocklist is only updated in the release.
+This format could be used in various router implementations.
+
+
+Design
+======
+
+Define the format to be wrapped in an su3 file.
+Allow blocking by IP or router hash.
+Routers may subscribe to a URL, or import a file obtained by other means.
+The su3 file contains a signature which must be verifed on import.
+
+
+Specification
+=============
+
+To be added to the router update specification page.
+
+Define new content type BLOCKLIST (5).
+Define new file type TXT_GZ (4) (.txt.gz format).
+Entries are one per line, either a literal IPv4 or IPv6 address,
+or a 44-character base64-encoded router hash.
+Support for blocking with a net mask, e.g. x.y.0.0/16, is optional.
+To unblock an entry, precede it with a '!'.
+Comments start with a '#'.
+
+
+Migration
+=========
+
+n/a
+
+
+
+See Also
+========
+
+Proposal 129
-- 
GitLab