From d3ef294058afe8be9c1f962ff67b794ef7926ca0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 12 2015 20:07:48 +0000 Subject: import docker-1.6.0-11.el7 --- diff --git a/.docker.metadata b/.docker.metadata index 5bc7ae5..e7c9fac 100644 --- a/.docker.metadata +++ b/.docker.metadata @@ -1,5 +1,6 @@ -408be931837f6b08eacbc47122770b77d7de50c1 SOURCES/4ff7dbd69a8b94309efda0683a824c4acf8e2ecc.tar.gz +9e424abc0ac39176f05ac1b7b86fbaa817ad7273 SOURCES/5b2fa8d261fc3392b44c50b631d586724f517138.tar.gz +333ccc3d821f9451f72c76c065f651bc42cc55e9 SOURCES/8aae715d99d7fdeaed1c8043e789d3620520ffef.tar.gz 430bf8e6f8d508f32618711002fbdabeb6a851f5 SOURCES/dcb4518b69b2071385089290bc75c63e5251fcba.tar.gz 43334fa753bf92a2d45176eff9c17d7c8a758aa1 SOURCES/docker-py-1.0.0.tar.gz -b5c7817c64a53958f2ee2ac9d49f40f62c7c572d SOURCES/fc0329baa1cc2f73349d564fb3d32e0112c51385.tar.gz +f292961a1b0caa64306810a513d2789ebc24b424 SOURCES/docker-selinux-d59539b.tar.gz c2866909e28d1a2f821f0c06f80f25c1c9adeff5 SOURCES/websocket-client-0.14.1.tar.gz diff --git a/.gitignore b/.gitignore index af13ec3..c976fcc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ -SOURCES/4ff7dbd69a8b94309efda0683a824c4acf8e2ecc.tar.gz +SOURCES/5b2fa8d261fc3392b44c50b631d586724f517138.tar.gz +SOURCES/8aae715d99d7fdeaed1c8043e789d3620520ffef.tar.gz SOURCES/dcb4518b69b2071385089290bc75c63e5251fcba.tar.gz SOURCES/docker-py-1.0.0.tar.gz -SOURCES/fc0329baa1cc2f73349d564fb3d32e0112c51385.tar.gz +SOURCES/docker-selinux-d59539b.tar.gz SOURCES/websocket-client-0.14.1.tar.gz diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/cve.patch b/SOURCES/cve.patch deleted file mode 100644 index 78f3e08..0000000 --- a/SOURCES/cve.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 4146cc61a6bd0a26f3b58db9be5b167006dd110c -Author: Dan Walsh -Date: Fri Mar 27 10:22:48 2015 - - Do not fallback to HTTP unless registry is insecure - - Do not consider additional registries as insecure. Refuse to fallback to - HTTP unless additional registry is also passed with - `--insecure-registry` flag. - - Signed-off-by: Michal Minar - - Docker-DCO-1.1-Signed-off-by: Dan Walsh (github: rhatdan) - -diff --git a/registry/config.go b/registry/config.go -index 7cf8e77..5aae180 100644 ---- a/registry/config.go -+++ b/registry/config.go -@@ -161,7 +161,7 @@ func NewServiceConfig(options *Options) *ServiceConfig { - config.IndexConfigs[r] = &IndexInfo{ - Name: r, - Mirrors: mirrors, -- Secure: r == INDEXNAME, -+ Secure: true, - Official: r == INDEXNAME, - } - } diff --git a/SOURCES/docker.service b/SOURCES/docker.service index 9841518..f012b8e 100644 --- a/SOURCES/docker.service +++ b/SOURCES/docker.service @@ -8,6 +8,7 @@ Type=notify EnvironmentFile=-/etc/sysconfig/docker EnvironmentFile=-/etc/sysconfig/docker-storage EnvironmentFile=-/etc/sysconfig/docker-network +Environment=GOTRACEBACK=crash ExecStart=/usr/bin/docker -d $OPTIONS \ $DOCKER_STORAGE_OPTIONS \ $DOCKER_NETWORK_OPTIONS \ diff --git a/SOURCES/docker.sysconfig b/SOURCES/docker.sysconfig index f37d29c..196c66f 100644 --- a/SOURCES/docker.sysconfig +++ b/SOURCES/docker.sysconfig @@ -9,7 +9,7 @@ DOCKER_CERT_PATH=/etc/docker # pull use the ADD_REGISTRY option to list a set of registries, each prepended # with --add-registry flag. The first registry added will be the first registry # searched. -#ADD_REGISTRY='--add-registry registry.access.redhat.com' +ADD_REGISTRY='--add-registry registry.access.redhat.com' # If you want to block registries from being used, uncomment the BLOCK_REGISTRY # option and give it a set of registries, each prepended with --block-registry @@ -34,6 +34,3 @@ DOCKER_CERT_PATH=/etc/docker # Controls the /etc/cron.daily/docker-logrotate cron job status. # To disable, uncomment the line below. # LOGROTATE=false -# - -GOTRACEBACK='crash' diff --git a/SOURCES/go-md2man.patch b/SOURCES/go-md2man.patch index c6cb17b..00c0cca 100644 --- a/SOURCES/go-md2man.patch +++ b/SOURCES/go-md2man.patch @@ -1,77 +1,85 @@ -From 626f83f8fff1c8ec87c96ec283a3cf2f99978d39 Mon Sep 17 00:00:00 2001 +From 4e3b8e37a34c9b6678320e6fcdad686fb481a58f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar -Date: Thu, 13 Nov 2014 11:24:09 -0800 -Subject: [PATCH] include vendor repos for manpage gen +Date: Thu, 30 Apr 2015 10:35:34 -0400 +Subject: [PATCH] include updated go-md2man and deps Signed-off-by: Lokesh Mandvekar --- - vendor/src/github.com/cpuguy83/go-md2man/README.md | 12 + - .../github.com/cpuguy83/go-md2man/mangen/mangen.go | 269 ++++ + .../src/github.com/cpuguy83/go-md2man/LICENSE.md | 21 + + vendor/src/github.com/cpuguy83/go-md2man/README.md | 11 + + .../github.com/cpuguy83/go-md2man/go-md2man.1.md | 21 + + .../github.com/cpuguy83/go-md2man/mangen/mangen.go | 272 ++++ vendor/src/github.com/cpuguy83/go-md2man/md2man.go | 55 + - .../src/github.com/russross/blackfriday/.gitignore | 8 + - .../src/github.com/russross/blackfriday/README.md | 255 ++++ - .../src/github.com/russross/blackfriday/block.go | 1315 ++++++++++++++++++++ - .../github.com/russross/blackfriday/block_test.go | 1063 ++++++++++++++++ - vendor/src/github.com/russross/blackfriday/html.go | 899 +++++++++++++ - .../src/github.com/russross/blackfriday/inline.go | 1078 ++++++++++++++++ - .../github.com/russross/blackfriday/inline_test.go | 796 ++++++++++++ + .../github.com/russross/blackfriday/.travis.yml | 17 + + .../github.com/russross/blackfriday/LICENSE.txt | 29 + + .../src/github.com/russross/blackfriday/README.md | 246 ++++ + .../src/github.com/russross/blackfriday/block.go | 1339 ++++++++++++++++++++ + .../github.com/russross/blackfriday/block_test.go | 1296 +++++++++++++++++++ + vendor/src/github.com/russross/blackfriday/html.go | 922 ++++++++++++++ + .../src/github.com/russross/blackfriday/inline.go | 1096 ++++++++++++++++ + .../github.com/russross/blackfriday/inline_test.go | 958 ++++++++++++++ .../src/github.com/russross/blackfriday/latex.go | 332 +++++ - .../github.com/russross/blackfriday/markdown.go | 845 +++++++++++++ - .../github.com/russross/blackfriday/sanitize.go | 154 +++ - .../russross/blackfriday/sanitize_test.go | 199 +++ - .../github.com/russross/blackfriday/smartypants.go | 376 ++++++ - .../upskirtref/Amps and angle encoding.html | 17 + - .../upskirtref/Amps and angle encoding.text | 21 + - .../blackfriday/upskirtref/Auto links.html | 18 + - .../blackfriday/upskirtref/Auto links.text | 13 + - .../blackfriday/upskirtref/Backslash escapes.html | 123 ++ - .../blackfriday/upskirtref/Backslash escapes.text | 126 ++ - .../upskirtref/Blockquotes with code blocks.html | 15 + - .../upskirtref/Blockquotes with code blocks.text | 11 + - .../blackfriday/upskirtref/Code Blocks.html | 18 + - .../blackfriday/upskirtref/Code Blocks.text | 14 + - .../blackfriday/upskirtref/Code Spans.html | 5 + - .../blackfriday/upskirtref/Code Spans.text | 6 + + .../github.com/russross/blackfriday/markdown.go | 838 ++++++++++++ + .../github.com/russross/blackfriday/ref_test.go | 128 ++ + .../github.com/russross/blackfriday/smartypants.go | 398 ++++++ + .../testdata/Amps and angle encoding.html | 17 + + .../testdata/Amps and angle encoding.text | 21 + + .../russross/blackfriday/testdata/Auto links.html | 18 + + .../russross/blackfriday/testdata/Auto links.text | 13 + + .../blackfriday/testdata/Backslash escapes.html | 123 ++ + .../blackfriday/testdata/Backslash escapes.text | 126 ++ + .../testdata/Blockquotes with code blocks.html | 15 + + .../testdata/Blockquotes with code blocks.text | 11 + + .../russross/blackfriday/testdata/Code Blocks.html | 18 + + .../russross/blackfriday/testdata/Code Blocks.text | 14 + + .../russross/blackfriday/testdata/Code Spans.html | 5 + + .../russross/blackfriday/testdata/Code Spans.text | 6 + ...list-like lines no empty line before block.html | 14 + ...list-like lines no empty line before block.text | 8 + ...rd-wrapped paragraphs with list-like lines.html | 8 + ...rd-wrapped paragraphs with list-like lines.text | 8 + - .../blackfriday/upskirtref/Horizontal rules.html | 71 ++ - .../blackfriday/upskirtref/Horizontal rules.text | 67 + - .../upskirtref/Inline HTML (Advanced).html | 15 + - .../upskirtref/Inline HTML (Advanced).text | 15 + - .../upskirtref/Inline HTML (Simple).html | 72 ++ - .../upskirtref/Inline HTML (Simple).text | 69 + - .../upskirtref/Inline HTML comments.html | 13 + - .../upskirtref/Inline HTML comments.text | 13 + - .../upskirtref/Links, inline style.html | 11 + - .../upskirtref/Links, inline style.text | 12 + - .../upskirtref/Links, reference style.html | 52 + - .../upskirtref/Links, reference style.text | 71 ++ - .../upskirtref/Links, shortcut references.html | 9 + - .../upskirtref/Links, shortcut references.text | 20 + - .../upskirtref/Literal quotes in titles.html | 3 + - .../upskirtref/Literal quotes in titles.text | 7 + - .../Markdown Documentation - Basics.html | 314 +++++ - .../Markdown Documentation - Basics.text | 306 +++++ - .../Markdown Documentation - Syntax.html | 946 ++++++++++++++ - .../Markdown Documentation - Syntax.text | 888 +++++++++++++ - .../blackfriday/upskirtref/Nested blockquotes.html | 9 + - .../blackfriday/upskirtref/Nested blockquotes.text | 5 + - .../upskirtref/Ordered and unordered lists.html | 166 +++ - .../upskirtref/Ordered and unordered lists.text | 131 ++ - .../upskirtref/Strong and em together.html | 7 + - .../upskirtref/Strong and em together.text | 7 + - .../russross/blackfriday/upskirtref/Tabs.html | 26 + - .../russross/blackfriday/upskirtref/Tabs.text | 21 + - .../russross/blackfriday/upskirtref/Tidyness.html | 9 + - .../russross/blackfriday/upskirtref/Tidyness.text | 5 + - .../russross/blackfriday/upskirtref_test.go | 128 ++ - 62 files changed, 11569 insertions(+) + .../blackfriday/testdata/Horizontal rules.html | 71 ++ + .../blackfriday/testdata/Horizontal rules.text | 67 + + .../testdata/Inline HTML (Advanced).html | 15 + + .../testdata/Inline HTML (Advanced).text | 15 + + .../blackfriday/testdata/Inline HTML (Simple).html | 72 ++ + .../blackfriday/testdata/Inline HTML (Simple).text | 69 + + .../blackfriday/testdata/Inline HTML comments.html | 13 + + .../blackfriday/testdata/Inline HTML comments.text | 13 + + .../blackfriday/testdata/Links, inline style.html | 11 + + .../blackfriday/testdata/Links, inline style.text | 12 + + .../testdata/Links, reference style.html | 52 + + .../testdata/Links, reference style.text | 71 ++ + .../testdata/Links, shortcut references.html | 9 + + .../testdata/Links, shortcut references.text | 20 + + .../testdata/Literal quotes in titles.html | 3 + + .../testdata/Literal quotes in titles.text | 7 + + .../testdata/Markdown Documentation - Basics.html | 314 +++++ + .../testdata/Markdown Documentation - Basics.text | 306 +++++ + .../testdata/Markdown Documentation - Syntax.html | 946 ++++++++++++++ + .../testdata/Markdown Documentation - Syntax.text | 888 +++++++++++++ + .../blackfriday/testdata/Nested blockquotes.html | 9 + + .../blackfriday/testdata/Nested blockquotes.text | 5 + + .../testdata/Ordered and unordered lists.html | 166 +++ + .../testdata/Ordered and unordered lists.text | 131 ++ + .../testdata/Strong and em together.html | 7 + + .../testdata/Strong and em together.text | 7 + + .../russross/blackfriday/testdata/Tabs.html | 26 + + .../russross/blackfriday/testdata/Tabs.text | 21 + + .../russross/blackfriday/testdata/Tidyness.html | 9 + + .../russross/blackfriday/testdata/Tidyness.text | 5 + + .../shurcooL/sanitized_anchor_name/.travis.yml | 10 + + .../shurcooL/sanitized_anchor_name/README.md | 25 + + .../shurcooL/sanitized_anchor_name/main.go | 29 + + .../shurcooL/sanitized_anchor_name/main_test.go | 35 + + 67 files changed, 11863 insertions(+) + create mode 100644 vendor/src/github.com/cpuguy83/go-md2man/LICENSE.md create mode 100644 vendor/src/github.com/cpuguy83/go-md2man/README.md + create mode 100644 vendor/src/github.com/cpuguy83/go-md2man/go-md2man.1.md create mode 100644 vendor/src/github.com/cpuguy83/go-md2man/mangen/mangen.go create mode 100644 vendor/src/github.com/cpuguy83/go-md2man/md2man.go - create mode 100644 vendor/src/github.com/russross/blackfriday/.gitignore + create mode 100644 vendor/src/github.com/russross/blackfriday/.travis.yml + create mode 100644 vendor/src/github.com/russross/blackfriday/LICENSE.txt create mode 100644 vendor/src/github.com/russross/blackfriday/README.md create mode 100644 vendor/src/github.com/russross/blackfriday/block.go create mode 100644 vendor/src/github.com/russross/blackfriday/block_test.go @@ -80,81 +88,136 @@ Signed-off-by: Lokesh Mandvekar create mode 100644 vendor/src/github.com/russross/blackfriday/inline_test.go create mode 100644 vendor/src/github.com/russross/blackfriday/latex.go create mode 100644 vendor/src/github.com/russross/blackfriday/markdown.go - create mode 100644 vendor/src/github.com/russross/blackfriday/sanitize.go - create mode 100644 vendor/src/github.com/russross/blackfriday/sanitize_test.go + create mode 100644 vendor/src/github.com/russross/blackfriday/ref_test.go create mode 100644 vendor/src/github.com/russross/blackfriday/smartypants.go - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Amps and angle encoding.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Amps and angle encoding.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Auto links.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Auto links.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Backslash escapes.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Backslash escapes.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Blockquotes with code blocks.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Blockquotes with code blocks.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Code Blocks.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Code Blocks.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Code Spans.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Code Spans.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines no empty line before block.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines no empty line before block.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Hard-wrapped paragraphs with list-like lines.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Horizontal rules.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Horizontal rules.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Advanced).html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Advanced).text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Simple).html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Inline HTML (Simple).text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Inline HTML comments.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Inline HTML comments.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Links, inline style.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Links, inline style.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Links, reference style.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Links, reference style.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Links, shortcut references.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Links, shortcut references.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Literal quotes in titles.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Literal quotes in titles.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Basics.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Basics.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Syntax.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Markdown Documentation - Syntax.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Nested blockquotes.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Nested blockquotes.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Ordered and unordered lists.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Ordered and unordered lists.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Strong and em together.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Strong and em together.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Tabs.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Tabs.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Tidyness.html - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref/Tidyness.text - create mode 100644 vendor/src/github.com/russross/blackfriday/upskirtref_test.go + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Amps and angle encoding.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Amps and angle encoding.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Auto links.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Auto links.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Backslash escapes.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Backslash escapes.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Blockquotes with code blocks.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Blockquotes with code blocks.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Code Blocks.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Code Blocks.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Code Spans.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Code Spans.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Hard-wrapped paragraphs with list-like lines no empty line before block.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Hard-wrapped paragraphs with list-like lines no empty line before block.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Hard-wrapped paragraphs with list-like lines.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Hard-wrapped paragraphs with list-like lines.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Horizontal rules.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Horizontal rules.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Inline HTML (Advanced).html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Inline HTML (Advanced).text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Inline HTML (Simple).html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Inline HTML (Simple).text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Inline HTML comments.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Inline HTML comments.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Links, inline style.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Links, inline style.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Links, reference style.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Links, reference style.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Links, shortcut references.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Links, shortcut references.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Literal quotes in titles.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Literal quotes in titles.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Markdown Documentation - Basics.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Markdown Documentation - Basics.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Markdown Documentation - Syntax.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Markdown Documentation - Syntax.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Nested blockquotes.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Nested blockquotes.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Ordered and unordered lists.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Ordered and unordered lists.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Strong and em together.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Strong and em together.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Tabs.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Tabs.text + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Tidyness.html + create mode 100644 vendor/src/github.com/russross/blackfriday/testdata/Tidyness.text + create mode 100644 vendor/src/github.com/shurcooL/sanitized_anchor_name/.travis.yml + create mode 100644 vendor/src/github.com/shurcooL/sanitized_anchor_name/README.md + create mode 100644 vendor/src/github.com/shurcooL/sanitized_anchor_name/main.go + create mode 100644 vendor/src/github.com/shurcooL/sanitized_anchor_name/main_test.go +diff --git a/vendor/src/github.com/cpuguy83/go-md2man/LICENSE.md b/vendor/src/github.com/cpuguy83/go-md2man/LICENSE.md +new file mode 100644 +index 0000000..1cade6c +--- /dev/null ++++ b/vendor/src/github.com/cpuguy83/go-md2man/LICENSE.md +@@ -0,0 +1,21 @@ ++The MIT License (MIT) ++ ++Copyright (c) 2014 Brian Goff ++ ++Permission is hereby granted, free of charge, to any person obtaining a copy ++of this software and associated documentation files (the "Software"), to deal ++in the Software without restriction, including without limitation the rights ++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++copies of the Software, and to permit persons to whom the Software is ++furnished to do so, subject to the following conditions: ++ ++The above copyright notice and this permission notice shall be included in all ++copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++SOFTWARE. diff --git a/vendor/src/github.com/cpuguy83/go-md2man/README.md b/vendor/src/github.com/cpuguy83/go-md2man/README.md new file mode 100644 -index 0000000..58e36e9 +index 0000000..8eb4b2e --- /dev/null +++ b/vendor/src/github.com/cpuguy83/go-md2man/README.md -@@ -0,0 +1,12 @@ +@@ -0,0 +1,11 @@ +go-md2man +========= + +** Work in Progress ** +This still needs a lot of help to be complete, or even usable! + -+Uses blackfirday to process markdown ++Uses blackfriday to process markdown into man pages. + +### Usage + +./md2man -in /path/to/markdownfile.md -out /manfile/output/path +diff --git a/vendor/src/github.com/cpuguy83/go-md2man/go-md2man.1.md b/vendor/src/github.com/cpuguy83/go-md2man/go-md2man.1.md +new file mode 100644 +index 0000000..1f7096a +--- /dev/null ++++ b/vendor/src/github.com/cpuguy83/go-md2man/go-md2man.1.md +@@ -0,0 +1,21 @@ ++go-md2man 1 "January 2015" go-md2man "User Manual" ++================================================== ++ ++# NAME ++ go-md2man - Convert mardown files into manpages ++ ++# SYNOPSIS ++ go-md2man -in=[/path/to/md/file] -out=[/path/to/output] ++ ++# Description ++ go-md2man converts standard markdown formatted documents into manpages. It is ++ written purely in Go so as to reduce dependencies on 3rd party libs. ++ ++# Example ++ Convert the markdown file "go-md2man.1.md" into a manpage. ++ ++ go-md2man -in=README.md -out=go-md2man.1.out ++ ++# HISTORY ++ January 2015, Originally compiled by Brian Goff( cpuguy83@gmail.com ) + diff --git a/vendor/src/github.com/cpuguy83/go-md2man/mangen/mangen.go b/vendor/src/github.com/cpuguy83/go-md2man/mangen/mangen.go new file mode 100644 -index 0000000..eb24957 +index 0000000..d436eed --- /dev/null +++ b/vendor/src/github.com/cpuguy83/go-md2man/mangen/mangen.go -@@ -0,0 +1,269 @@ +@@ -0,0 +1,272 @@ +package mangen + +import ( @@ -196,7 +259,7 @@ index 0000000..eb24957 +func (m *Man) BlockCode(out *bytes.Buffer, text []byte, lang string) { + out.WriteString("\n.PP\n.RS\n\n.nf\n") + escapeSpecialChars(out, text) -+ out.WriteString("\n.fi\n") ++ out.WriteString("\n.fi\n.RE\n") +} + +func (m *Man) BlockQuote(out *bytes.Buffer, text []byte) { @@ -206,7 +269,6 @@ index 0000000..eb24957 +} + +func (m *Man) BlockHtml(out *bytes.Buffer, text []byte) { -+ // a pretty lame thing to do... + fmt.Errorf("man: BlockHtml not supported") + out.Write(text) +} @@ -214,14 +276,18 @@ index 0000000..eb24957 +func (m *Man) Header(out *bytes.Buffer, text func() bool, level int, id string) { + marker := out.Len() + -+ switch level { -+ case 1: ++ switch { ++ case marker == 0: ++ // This is the doc header ++ out.WriteString(".TH ") ++ case level == 1: ++ out.WriteString("\n\n.SH ") ++ case level == 2: + out.WriteString("\n.SH ") -+ case 2: -+ out.WriteString(".SH ") + default: -+ out.WriteString(".SS ") ++ out.WriteString("\n.SS ") + } ++ + if !text() { + out.Truncate(marker) + return @@ -344,7 +410,7 @@ index 0000000..eb24957 +} + +func (m *Man) RawHtmlTag(out *bytes.Buffer, tag []byte) { -+ fmt.Errorf("man: Raw HTML not supported") ++ out.Write(tag) +} + +func (m *Man) TripleEmphasis(out *bytes.Buffer, text []byte) { @@ -396,7 +462,7 @@ index 0000000..eb24957 +} + +func needsBackslash(c byte) bool { -+ for _, r := range []byte("-_{}$&\\~") { ++ for _, r := range []byte("-_{}&\\~") { + if c == r { + return true + } @@ -485,27 +551,71 @@ index 0000000..f8b1722 + os.Exit(1) + } +} -diff --git a/vendor/src/github.com/russross/blackfriday/.gitignore b/vendor/src/github.com/russross/blackfriday/.gitignore +diff --git a/vendor/src/github.com/russross/blackfriday/.travis.yml b/vendor/src/github.com/russross/blackfriday/.travis.yml new file mode 100644 -index 0000000..75623dc +index 0000000..4dd7a1c --- /dev/null -+++ b/vendor/src/github.com/russross/blackfriday/.gitignore -@@ -0,0 +1,8 @@ -+*.out -+*.swp -+*.8 -+*.6 -+_obj -+_test* -+markdown -+tags ++++ b/vendor/src/github.com/russross/blackfriday/.travis.yml +@@ -0,0 +1,17 @@ ++# Travis CI (http://travis-ci.org/) is a continuous integration service for ++# open source projects. This file configures it to run unit tests for ++# blackfriday. ++ ++language: go ++ ++go: ++ - 1.2 ++ - 1.3 ++ - 1.4 ++ ++install: ++ - go get -d -t -v ./... ++ - go build -v ./... ++ ++script: ++ - go test -v ./... +diff --git a/vendor/src/github.com/russross/blackfriday/LICENSE.txt b/vendor/src/github.com/russross/blackfriday/LICENSE.txt +new file mode 100644 +index 0000000..2885af3 +--- /dev/null ++++ b/vendor/src/github.com/russross/blackfriday/LICENSE.txt +@@ -0,0 +1,29 @@ ++Blackfriday is distributed under the Simplified BSD License: ++ ++> Copyright © 2011 Russ Ross ++> All rights reserved. ++> ++> Redistribution and use in source and binary forms, with or without ++> modification, are permitted provided that the following conditions ++> are met: ++> ++> 1. Redistributions of source code must retain the above copyright ++> notice, this list of conditions and the following disclaimer. ++> ++> 2. Redistributions in binary form must reproduce the above ++> copyright notice, this list of conditions and the following ++> disclaimer in the documentation and/or other materials provided with ++> the distribution. ++> ++> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++> "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++> LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++> FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ++> COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, ++> INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, ++> BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++> LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ++> ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ++> POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/src/github.com/russross/blackfriday/README.md b/vendor/src/github.com/russross/blackfriday/README.md new file mode 100644 -index 0000000..55270d8 +index 0000000..1bb985d --- /dev/null +++ b/vendor/src/github.com/russross/blackfriday/README.md -@@ -0,0 +1,255 @@ -+Blackfriday +@@ -0,0 +1,246 @@ ++Blackfriday [![Build Status](https://travis-ci.org/russross/blackfriday.svg?branch=master)](https://travis-ci.org/russross/blackfriday) +=========== + +Blackfriday is a [Markdown][1] processor implemented in [Go][2]. It @@ -517,7 +627,7 @@ index 0000000..55270d8 +HTML output is currently supported, along with Smartypants +extensions. An experimental LaTeX output engine is also included. + -+It started as a translation from C of [upskirt][3]. ++It started as a translation from C of [Sundown][3]. + + +Installation @@ -533,13 +643,12 @@ index 0000000..55270d8 + go get github.com/russross/blackfriday + +will download, compile, and install the package into your `$GOPATH` -+directory hierarchy. Alternatively, you can import it into a -+project: ++directory hierarchy. Alternatively, you can achieve the same if you ++import it into a project: + + import "github.com/russross/blackfriday" + -+and when you build that project with `go build`, blackfriday will be -+downloaded and installed automatically. ++and `go get` without parameters. + +Usage +----- @@ -554,6 +663,28 @@ index 0000000..55270d8 + + output := blackfriday.MarkdownCommon(input) + ++### Sanitize untrusted content ++ ++Blackfriday itself does nothing to protect against malicious content. If you are ++dealing with user-supplied markdown, we recommend running blackfriday's output ++through HTML sanitizer such as ++[Bluemonday](https://github.com/microcosm-cc/bluemonday). ++ ++Here's an example of simple usage of blackfriday together with bluemonday: ++ ++``` go ++import ( ++ "github.com/microcosm-cc/bluemonday" ++ "github.com/russross/blackfriday" ++) ++ ++// ... ++unsafe := blackfriday.MarkdownCommon(input) ++html := bluemonday.UGCPolicy().SanitizeBytes(unsafe) ++``` ++ ++### Custom options ++ +If you want to customize the set of options, first get a renderer +(currently either the HTML or LaTeX output engines), then use it to +call the more general `Markdown` function. For examples, see the @@ -583,7 +714,7 @@ index 0000000..55270d8 +Features +-------- + -+All features of upskirt are supported, including: ++All features of Sundown are supported, including: + +* **Compatibility**. The Markdown v1.0.3 test suite passes with + the `--tidy` option. Without `--tidy`, the differences are @@ -599,10 +730,9 @@ index 0000000..55270d8 + known inputs that make it crash. If you find one, please let me + know and send me the input that does it. + -+ NOTE: "safety" in this context means *runtime safety only*. It is -+ not bullet proof against JavaScript injections, though we're working -+ on it (https://github.com/russross/blackfriday/issues/11 tracks the -+ progress). ++ NOTE: "safety" in this context means *runtime safety only*. In order to ++ protect yourself agains JavaScript injection in untrusted content, see ++ [this example](https://github.com/russross/blackfriday#sanitize-untrusted-content). + +* **Fast processing**. It is fast enough to render on-demand in + most web applications without having to cache the output. @@ -716,7 +846,6 @@ index 0000000..55270d8 +---- + +* More unit testing -+* Markdown pretty-printer output engine +* Improve unicode support. It does not understand all unicode + rules (about what constitutes a letter, a punctuation symbol, + etc.), so it may fail to detect word boundaries correctly in @@ -726,46 +855,18 @@ index 0000000..55270d8 +License +------- + -+Blackfriday is distributed under the Simplified BSD License: -+ -+> Copyright © 2011 Russ Ross -+> All rights reserved. -+> -+> Redistribution and use in source and binary forms, with or without -+> modification, are permitted provided that the following conditions -+> are met: -+> -+> 1. Redistributions of source code must retain the above copyright -+> notice, this list of conditions and the following disclaimer. -+> -+> 2. Redistributions in binary form must reproduce the above -+> copyright notice, this list of conditions and the following -+> disclaimer in the documentation and/or other materials provided with -+> the distribution. -+> -+> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+> "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+> LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -+> FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -+> COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -+> INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -+> BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -+> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+> LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -+> ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+> POSSIBILITY OF SUCH DAMAGE. ++[Blackfriday is distributed under the Simplified BSD License](LICENSE.txt) + + + [1]: http://daringfireball.net/projects/markdown/ "Markdown" + [2]: http://golang.org/ "Go Language" -+ [3]: http://github.com/tanoku/upskirt "Upskirt" ++ [3]: https://github.com/vmg/sundown "Sundown" diff --git a/vendor/src/github.com/russross/blackfriday/block.go b/vendor/src/github.com/russross/blackfriday/block.go new file mode 100644 -index 0000000..d21a0e6 +index 0000000..59c6d28 --- /dev/null +++ b/vendor/src/github.com/russross/blackfriday/block.go -@@ -0,0 +1,1315 @@ +@@ -0,0 +1,1339 @@ +// +// Blackfriday Markdown Processor +// Available at http://github.com/russross/blackfriday @@ -781,7 +882,11 @@ index 0000000..d21a0e6 + +package blackfriday + -+import "bytes" ++import ( ++ "bytes" ++ ++ "github.com/shurcooL/sanitized_anchor_name" ++) + +// Parse block-level data. +// Note: this function and many that it calls assume that @@ -991,6 +1096,9 @@ index 0000000..d21a0e6 + end-- + } + if end > i { ++ if id == "" && p.flags&EXTENSION_AUTO_HEADER_IDS != 0 { ++ id = sanitized_anchor_name.Create(string(data[i:end])) ++ } + work := func() bool { + p.inline(out, data[i:end]) + return true @@ -1317,9 +1425,12 @@ index 0000000..d21a0e6 + skip = 0 + + // skip up to three spaces -+ for i < 3 && data[i] == ' ' { ++ for i < len(data) && i < 3 && data[i] == ' ' { + i++ + } ++ if i >= len(data) { ++ return ++ } + + // check for the marker characters: ~ or ` + if data[i] != '~' && data[i] != '`' { @@ -1329,11 +1440,15 @@ index 0000000..d21a0e6 + c := data[i] + + // the whole line must be the same char or whitespace -+ for data[i] == c { ++ for i < len(data) && data[i] == c { + size++ + i++ + } + ++ if i >= len(data) { ++ return ++ } ++ + // the marker char must occur at least 3 times + if size < 3 { + return @@ -1348,22 +1463,26 @@ index 0000000..d21a0e6 + if syntax != nil { + syn := 0 + -+ for data[i] == ' ' { ++ for i < len(data) && data[i] == ' ' { + i++ + } + ++ if i >= len(data) { ++ return ++ } ++ + syntaxStart := i + + if data[i] == '{' { + i++ + syntaxStart++ + -+ for data[i] != '}' && data[i] != '\n' { ++ for i < len(data) && data[i] != '}' && data[i] != '\n' { + syn++ + i++ + } + -+ if data[i] != '}' { ++ if i >= len(data) || data[i] != '}' { + return + } + @@ -1380,7 +1499,7 @@ index 0000000..d21a0e6 + + i++ + } else { -+ for !isspace(data[i]) { ++ for i < len(data) && !isspace(data[i]) { + syn++ + i++ + } @@ -1390,10 +1509,10 @@ index 0000000..d21a0e6 + *syntax = &language + } + -+ for data[i] == ' ' { ++ for i < len(data) && data[i] == ' ' { + i++ + } -+ if data[i] != '\n' { ++ if i >= len(data) || data[i] != '\n' { + return + } + @@ -1422,7 +1541,7 @@ index 0000000..d21a0e6 + + // copy the current line + end := beg -+ for data[end] != '\n' { ++ for end < len(data) && data[end] != '\n' { + end++ + } + end++ @@ -2035,7 +2154,13 @@ index 0000000..d21a0e6 + return true + } + }(out, p, data[prev:eol]) -+ p.r.Header(out, work, level, "") ++ ++ id := "" ++ if p.flags&EXTENSION_AUTO_HEADER_IDS != 0 { ++ id = sanitized_anchor_name.Create(string(data[prev:eol])) ++ } ++ ++ p.r.Header(out, work, level, id) + + // find the end of the underline + for data[i] != '\n' { @@ -2083,10 +2208,10 @@ index 0000000..d21a0e6 +} diff --git a/vendor/src/github.com/russross/blackfriday/block_test.go b/vendor/src/github.com/russross/blackfriday/block_test.go new file mode 100644 -index 0000000..c9d4a88 +index 0000000..b726c07 --- /dev/null +++ b/vendor/src/github.com/russross/blackfriday/block_test.go -@@ -0,0 +1,1063 @@ +@@ -0,0 +1,1296 @@ +// +// Blackfriday Markdown Processor +// Available at http://github.com/russross/blackfriday @@ -2106,16 +2231,35 @@ index 0000000..c9d4a88 + "testing" +) + ++func runMarkdownBlockWithRenderer(input string, extensions int, renderer Renderer) string { ++ return string(Markdown([]byte(input), renderer, extensions)) ++} ++ +func runMarkdownBlock(input string, extensions int) string { + htmlFlags := 0 + htmlFlags |= HTML_USE_XHTML + + renderer := HtmlRenderer(htmlFlags, "", "") + -+ return string(Markdown([]byte(input), renderer, extensions)) ++ return runMarkdownBlockWithRenderer(input, extensions, renderer) ++} ++ ++func runnerWithRendererParameters(parameters HtmlRendererParameters) func(string, int) string { ++ return func(input string, extensions int) string { ++ htmlFlags := 0 ++ htmlFlags |= HTML_USE_XHTML ++ ++ renderer := HtmlRendererWithParameters(htmlFlags, "", "", parameters) ++ ++ return runMarkdownBlockWithRenderer(input, extensions, renderer) ++ } +} + +func doTestsBlock(t *testing.T, tests []string, extensions int) { ++ doTestsBlockWithRunner(t, tests, extensions, runMarkdownBlock) ++} ++ ++func doTestsBlockWithRunner(t *testing.T, tests []string, extensions int, runner func(string, int) string) { + // catch and report panics + var candidate string + defer func() { @@ -2128,7 +2272,7 @@ index 0000000..c9d4a88 + input := tests[i] + candidate = input + expected := tests[i+1] -+ actual := runMarkdownBlock(candidate, extensions) ++ actual := runner(candidate, extensions) + if actual != expected { + t.Errorf("\nInput [%#v]\nExpected[%#v]\nActual [%#v]", + candidate, expected, actual) @@ -2326,6 +2470,170 @@ index 0000000..c9d4a88 + doTestsBlock(t, tests, EXTENSION_HEADER_IDS) +} + ++func TestPrefixHeaderIdExtensionWithPrefixAndSuffix(t *testing.T) { ++ var tests = []string{ ++ "# header 1 {#someid}\n", ++ "

header 1

\n", ++ ++ "## header 2 {#someid}\n", ++ "

header 2

\n", ++ ++ "### header 3 {#someid}\n", ++ "

header 3

\n", ++ ++ "#### header 4 {#someid}\n", ++ "

header 4

\n", ++ ++ "##### header 5 {#someid}\n", ++ "
header 5
\n", ++ ++ "###### header 6 {#someid}\n", ++ "
header 6
\n", ++ ++ "####### header 7 {#someid}\n", ++ "
# header 7
\n", ++ ++ "# header 1 # {#someid}\n", ++ "

header 1

\n", ++ ++ "## header 2 ## {#someid}\n", ++ "

header 2

\n", ++ ++ "* List\n# Header {#someid}\n* List\n", ++ "
    \n

  • List

    \n\n

    Header

    • \n\n

  • List

    • \n
\n", ++ ++ "* List\n#Header {#someid}\n* List\n", ++ "
    \n

  • List

    \n\n

    Header

    • \n\n

  • List

    • \n
\n", ++ ++ "* List\n * Nested list\n # Nested header {#someid}\n", ++ "
    \n

  • List

    \n\n
      \n

    • Nested list

      \n\n" + ++ "

      Nested header

      • \n
    • \n
\n", ++ } ++ ++ parameters := HtmlRendererParameters{ ++ HeaderIDPrefix: "PRE:", ++ HeaderIDSuffix: ":POST", ++ } ++ ++ doTestsBlockWithRunner(t, tests, EXTENSION_HEADER_IDS, runnerWithRendererParameters(parameters)) ++} ++ ++func TestPrefixAutoHeaderIdExtension(t *testing.T) { ++ var tests = []string{ ++ "# Header 1\n", ++ "

Header 1

\n", ++ ++ "# Header 1 \n", ++ "

Header 1

\n", ++ ++ "## Header 2\n", ++ "

Header 2

\n", ++ ++ "### Header 3\n", ++ "

Header 3

\n", ++ ++ "#### Header 4\n", ++ "

Header 4

\n", ++ ++ "##### Header 5\n", ++ "
Header 5
\n", ++ ++ "###### Header 6\n", ++ "
Header 6
\n", ++ ++ "####### Header 7\n", ++ "
# Header 7
\n", ++ ++ "Hello\n# Header 1\nGoodbye\n", ++ "

Hello

\n\n

Header 1

\n\n

Goodbye

\n", ++ ++ "* List\n# Header\n* List\n", ++ "
    \n

  • List

    \n\n

    Header

    • \n\n

  • List

    • \n
\n", ++ ++ "* List\n#Header\n* List\n", ++ "
    \n

  • List

    \n\n

    Header

    • \n\n

  • List

    • \n
\n", ++ ++ "* List\n * Nested list\n # Nested header\n", ++ "
    \n

  • List

    \n\n
      \n

    • Nested list

      \n\n" + ++ "

      Nested header

      • \n
    • \n
\n", ++ ++ "# Header\n\n# Header\n", ++ "

Header

\n\n

Header

\n", ++ ++ "# Header 1\n\n# Header 1", ++ "

Header 1

\n\n

Header 1

\n", ++ ++ "# Header\n\n# Header 1\n\n# Header\n\n# Header", ++ "

Header

\n\n

Header 1

\n\n

Header

\n\n

Header

\n", ++ } ++ doTestsBlock(t, tests, EXTENSION_AUTO_HEADER_IDS) ++} ++ ++func TestPrefixAutoHeaderIdExtensionWithPrefixAndSuffix(t *testing.T) { ++ var tests = []string{ ++ "# Header 1\n", ++ "

Header 1

\n", ++ ++ "# Header 1 \n", ++ "

Header 1

\n", ++ ++ "## Header 2\n", ++ "

Header 2

\n", ++ ++ "### Header 3\n", ++ "

Header 3

\n", ++ ++ "#### Header 4\n", ++ "

Header 4

\n", ++ ++ "##### Header 5\n", ++ "
Header 5
\n", ++ ++ "###### Header 6\n", ++ "
Header 6
\n", ++ ++ "####### Header 7\n", ++ "
# Header 7
\n", ++ ++ "Hello\n# Header 1\nGoodbye\n", ++ "

Hello

\n\n

Header 1

\n\n

Goodbye

\n", ++ ++ "* List\n# Header\n* List\n", ++ "
    \n

  • List

    \n\n

    Header

    • \n\n

  • List

    • \n
\n", ++ ++ "* List\n#Header\n* List\n", ++ "
    \n

  • List

    \n\n

    Header

    • \n\n

  • List

    • \n
\n", ++ ++ "* List\n * Nested list\n # Nested header\n", ++ "
    \n

  • List

    \n\n
      \n

    • Nested list

      \n\n" + ++ "

      Nested header

      • \n
    • \n
\n", ++ ++ "# Header\n\n# Header\n", ++ "

Header

\n\n

Header

\n", ++ ++ "# Header 1\n\n# Header 1", ++ "

Header 1

\n\n

Header 1

\n", ++ ++ "# Header\n\n# Header 1\n\n# Header\n\n# Header", ++ "

Header

\n\n

Header 1

\n\n

Header

\n\n

Header

\n", ++ } ++ ++ parameters := HtmlRendererParameters{ ++ HeaderIDPrefix: "PRE:", ++ HeaderIDSuffix: ":POST", ++ } ++ ++ doTestsBlockWithRunner(t, tests, EXTENSION_AUTO_HEADER_IDS, runnerWithRendererParameters(parameters)) ++} ++ ++func TestPrefixMultipleHeaderExtensions(t *testing.T) { ++ var tests = []string{ ++ "# Header\n\n# Header {#header}\n\n# Header 1", ++ "

Header

\n\n

Header

\n\n

Header 1

\n", ++ } ++ doTestsBlock(t, tests, EXTENSION_AUTO_HEADER_IDS|EXTENSION_HEADER_IDS) ++} ++ +func TestUnderlineHeaders(t *testing.T) { + var tests = []string{ + "Header 1\n========\n", @@ -2376,6 +2684,56 @@ index 0000000..c9d4a88 + doTestsBlock(t, tests, 0) +} + ++func TestUnderlineHeadersAutoIDs(t *testing.T) { ++ var tests = []string{ ++ "Header 1\n========\n", ++ "

Header 1

\n", ++ ++ "Header 2\n--------\n", ++ "

Header 2

\n", ++ ++ "A\n=\n", ++ "

A

\n", ++ ++ "B\n-\n", ++ "

B

\n", ++ ++ "Paragraph\nHeader\n=\n", ++ "

Paragraph

\n\n

Header

\n", ++ ++ "Header\n===\nParagraph\n", ++ "

Header

\n\n

Paragraph

\n", ++ ++ "Header\n===\nAnother header\n---\n", ++ "

Header

\n\n

Another header

\n", ++ ++ " Header\n======\n", ++ "

Header

\n", ++ ++ "Header with *inline*\n=====\n", ++ "

Header with inline

\n", ++ ++ "Paragraph\n\n\n\n\nHeader\n===\n", ++ "

Paragraph

\n\n

Header

\n", ++ ++ "Trailing space \n==== \n\n", ++ "

Trailing space

\n", ++ ++ "Trailing spaces\n==== \n\n", ++ "

Trailing spaces

\n", ++ ++ "Double underline\n=====\n=====\n", ++ "

Double underline

\n\n

=====

\n", ++ ++ "Header\n======\n\nHeader\n======\n", ++ "

Header

\n\n

Header

\n", ++ ++ "Header 1\n========\n\nHeader 1\n========\n", ++ "

Header 1

\n\n

Header 1

\n", ++ } ++ doTestsBlock(t, tests, EXTENSION_AUTO_HEADER_IDS) ++} ++ +func TestHorizontalRule(t *testing.T) { + var tests = []string{ + "-\n", @@ -2727,25 +3085,25 @@ index 0000000..c9d4a88 +func TestFencedCodeBlock(t *testing.T) { + var tests = []string{ + "``` go\nfunc foo() bool {\n\treturn true;\n}\n```\n", -+ "
func foo() bool {\n\treturn true;\n}\n
\n", ++ "
func foo() bool {\n\treturn true;\n}\n
\n", + + "``` c\n/* special & char < > \" escaping */\n```\n", -+ "
/* special & char < > " escaping */\n
\n", ++ "
/* special & char < > " escaping */\n
\n", + + "``` c\nno *inline* processing ~~of text~~\n```\n", -+ "
no *inline* processing ~~of text~~\n
\n", ++ "
no *inline* processing ~~of text~~\n
\n", + + "```\nNo language\n```\n", + "
No language\n
\n", + + "``` {ocaml}\nlanguage in braces\n```\n", -+ "
language in braces\n
\n", ++ "
language in braces\n
\n", + + "``` {ocaml} \nwith extra whitespace\n```\n", -+ "
with extra whitespace\n
\n", ++ "
with extra whitespace\n
\n", + + "```{ ocaml }\nwith extra whitespace\n```\n", -+ "
with extra whitespace\n
\n", ++ "
with extra whitespace\n
\n", + + "~ ~~ java\nWith whitespace\n~~~\n", + "

~ ~~ java\nWith whitespace\n~~~

\n", @@ -2754,7 +3112,7 @@ index 0000000..c9d4a88 + "

~~\nonly two\n~~

\n", + + "```` python\nextra\n````\n", -+ "
extra\n
\n", ++ "
extra\n
\n", + + "~~~ perl\nthree to start, four to end\n~~~~\n", + "

~~~ perl\nthree to start, four to end\n~~~~

\n", @@ -2763,7 +3121,7 @@ index 0000000..c9d4a88 + "

~~~~ perl\nfour to start, three to end\n~~~

\n", + + "~~~ bash\ntildes\n~~~\n", -+ "
tildes\n
\n", ++ "
tildes\n
\n", + + "``` lisp\nno ending\n", + "

``` lisp\nno ending

\n", @@ -2778,34 +3136,34 @@ index 0000000..c9d4a88 + "

~~~\nmismatched begin and end\n```

\n", + + " ``` oz\nleading spaces\n```\n", -+ "
leading spaces\n
\n", ++ "
leading spaces\n
\n", + + " ``` oz\nleading spaces\n ```\n", -+ "
leading spaces\n
\n", ++ "
leading spaces\n
\n", + + " ``` oz\nleading spaces\n ```\n", -+ "
leading spaces\n
\n", ++ "
leading spaces\n
\n", + + "``` oz\nleading spaces\n ```\n", -+ "
leading spaces\n
\n", ++ "
leading spaces\n
\n", + + " ``` oz\nleading spaces\n ```\n", + "
``` oz\n
\n\n

leading spaces\n ```

\n", + + "Bla bla\n\n``` oz\ncode blocks breakup paragraphs\n```\n\nBla Bla\n", -+ "

Bla bla

\n\n
code blocks breakup paragraphs\n
\n\n

Bla Bla

\n", ++ "

Bla bla

\n\n
code blocks breakup paragraphs\n
\n\n

Bla Bla

\n", + + "Some text before a fenced code block\n``` oz\ncode blocks breakup paragraphs\n```\nAnd some text after a fenced code block", -+ "

Some text before a fenced code block

\n\n
code blocks breakup paragraphs\n
\n\n

And some text after a fenced code block

\n", ++ "

Some text before a fenced code block

\n\n
code blocks breakup paragraphs\n
\n\n

And some text after a fenced code block

\n", + + "`", + "

`

\n", + + "Bla bla\n\n``` oz\ncode blocks breakup paragraphs\n```\n\nBla Bla\n\n``` oz\nmultiple code blocks work okay\n```\n\nBla Bla\n", -+ "

Bla bla

\n\n
code blocks breakup paragraphs\n
\n\n

Bla Bla

\n\n
multiple code blocks work okay\n
\n\n

Bla Bla

\n", ++ "

Bla bla

\n\n
code blocks breakup paragraphs\n
\n\n

Bla Bla

\n\n
multiple code blocks work okay\n
\n\n

Bla Bla

\n", + + "Some text before a fenced code block\n``` oz\ncode blocks breakup paragraphs\n```\nSome text in between\n``` oz\nmultiple code blocks work okay\n```\nAnd some text after a fenced code block", -+ "

Some text before a fenced code block

\n\n
code blocks breakup paragraphs\n
\n\n

Some text in between

\n\n
multiple code blocks work okay\n
\n\n

And some text after a fenced code block

\n", ++ "

Some text before a fenced code block

\n\n
code blocks breakup paragraphs\n
\n\n

Some text in between

\n\n
multiple code blocks work okay\n
\n\n

And some text after a fenced code block

\n", + } + doTestsBlock(t, tests, EXTENSION_FENCED_CODE) +} @@ -3067,25 +3425,25 @@ index 0000000..c9d4a88 +func TestFencedCodeBlock_EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK(t *testing.T) { + var tests = []string{ + "``` go\nfunc foo() bool {\n\treturn true;\n}\n```\n", -+ "
func foo() bool {\n\treturn true;\n}\n
\n", ++ "
func foo() bool {\n\treturn true;\n}\n
\n", + + "``` c\n/* special & char < > \" escaping */\n```\n", -+ "
/* special & char < > " escaping */\n
\n", ++ "
/* special & char < > " escaping */\n
\n", + + "``` c\nno *inline* processing ~~of text~~\n```\n", -+ "
no *inline* processing ~~of text~~\n
\n", ++ "
no *inline* processing ~~of text~~\n
\n", + + "```\nNo language\n```\n", + "
No language\n
\n", + + "``` {ocaml}\nlanguage in braces\n```\n", -+ "
language in braces\n
\n", ++ "
language in braces\n
\n", + + "``` {ocaml} \nwith extra whitespace\n```\n", -+ "
with extra whitespace\n
\n", ++ "
with extra whitespace\n
\n", + + "```{ ocaml }\nwith extra whitespace\n```\n", -+ "
with extra whitespace\n
\n", ++ "
with extra whitespace\n
\n", + + "~ ~~ java\nWith whitespace\n~~~\n", + "

~ ~~ java\nWith whitespace\n~~~

\n", @@ -3094,7 +3452,7 @@ index 0000000..c9d4a88 + "

~~\nonly two\n~~

\n", + + "```` python\nextra\n````\n", -+ "
extra\n
\n", ++ "
extra\n
\n", + + "~~~ perl\nthree to start, four to end\n~~~~\n", + "

~~~ perl\nthree to start, four to end\n~~~~

\n", @@ -3103,7 +3461,7 @@ index 0000000..c9d4a88 + "

~~~~ perl\nfour to start, three to end\n~~~

\n", + + "~~~ bash\ntildes\n~~~\n", -+ "
tildes\n
\n", ++ "
tildes\n
\n", + + "``` lisp\nno ending\n", + "

``` lisp\nno ending

\n", @@ -3118,16 +3476,16 @@ index 0000000..c9d4a88 + "

~~~\nmismatched begin and end\n```

\n", + + " ``` oz\nleading spaces\n```\n", -+ "
leading spaces\n
\n", ++ "
leading spaces\n
\n", + + " ``` oz\nleading spaces\n ```\n", -+ "
leading spaces\n
\n", ++ "
leading spaces\n
\n", + + " ``` oz\nleading spaces\n ```\n", -+ "
leading spaces\n
\n", ++ "
leading spaces\n
\n", + + "``` oz\nleading spaces\n ```\n", -+ "
leading spaces\n
\n", ++ "
leading spaces\n
\n", + + " ``` oz\nleading spaces\n ```\n", + "
``` oz\n
\n\n

leading spaces

\n\n
```\n
\n", @@ -3152,10 +3510,10 @@ index 0000000..c9d4a88 +} diff --git a/vendor/src/github.com/russross/blackfriday/html.go b/vendor/src/github.com/russross/blackfriday/html.go new file mode 100644 -index 0000000..982131c +index 0000000..3655a10 --- /dev/null +++ b/vendor/src/github.com/russross/blackfriday/html.go -@@ -0,0 +1,899 @@ +@@ -0,0 +1,922 @@ +// +// Blackfriday Markdown Processor +// Available at http://github.com/russross/blackfriday @@ -3183,23 +3541,23 @@ index 0000000..982131c + +// Html renderer configuration options. +const ( -+ HTML_SKIP_HTML = 1 << iota // skip preformatted HTML blocks -+ HTML_SKIP_STYLE // skip embedded \n", -+ "

zz <style>p {}</style>

\n", -+ -+ "zz \n", -+ "

zz <style>p {}</style>

\n", -+ -+ "\n", -+ "

<script>alert()</script>

\n", -+ -+ "zz \n", -+ "

zz <script>alert()</script>

\n", -+ -+ "zz \n", -+ "

zz <script>alert()</script>

\n", -+ -+ " \n", -+ "

<script>alert()</script>

\n", -+ -+ "\n", -+ "<script>alert()</script>\n", -+ -+ "\n", -+ "<script src='foo'></script>\n", -+ -+ "\n", -+ "<script src='a>b'></script>\n", -+ -+ "zz \n", -+ "

zz <script src='foo'></script>

\n", -+ -+ "zz \n", -+ "

zz <script src=foo></script>

\n", -+ -+ ``, -+ "<script><script src="http://example.com/exploit.js"></script></script>\n", -+ -+ `'';!--"=&{()}`, -+ "

'';!--"<xss>=&{()}

\n", -+ -+ "", -+ "

<script SRC=http://ha.ckers.org/xss.js></script>

\n", -+ -+ "", -+ "

<script \nSRC=http://ha.ckers.org/xss.js></script>

\n", -+ -+ ``, -+ "

\n", -+ -+ "", -+ "

\n", -+ -+ "", -+ "

\n", -+ -+ "", -+ "

\n", -+ -+ `xss link`, -+ "

xss link

\n", -+ -+ "xss link", -+ "

xss link

\n", -+ -+ `">`, -+ "

<script>alert("XSS")</script>">

\n", -+ -+ "", -+ "

\n", -+ -+ ``, -+ "

\n", -+ -+ ``, -+ "

\n", -+ -+ ``, -+ "

\n", -+ -+ "", -+ "

\n", -+ -+ "", -+ "

\n", -+ -+ "", -+ "

\n", -+ -+ ``, -+ "

\n", -+ -+ ``, -+ "

\n", -+ -+ ``, -+ "

\n", -+ -+ ``, -+ "

\n", -+ -+ ``, -+ "

\n", -+ -+ ``, -+ "

<script/XSS SRC="http://ha.ckers.org/xss.js"></script>

\n", -+ -+ "", -+ "

<body onload!#$%&()*~+-_.,:;?@[/|\\]^`=alert("XSS")>

\n", -+ -+ ``, -+ "

<script/SRC="http://ha.ckers.org/xss.js"></script>

\n", -+ -+ `<`, -+ "

<<script>alert("XSS");//<</script>

\n", -+ -+ "