From 4d4940c08511002be88e1f950072700f75228b7d Mon Sep 17 00:00:00 2001 From: Hannah Ward Date: Tue, 19 Feb 2019 17:34:11 +0000 Subject: [PATCH 1/3] fix: Allow building on non-adulau system --- .gitignore | 2 ++ README.md | 20 +++++++++++++++++++- misp-core-format/Makefile | 3 +-- misp-galaxy-format/Makefile | 2 +- misp-object-template-format/Makefile | 2 +- misp-query-format/Makefile | 2 +- misp-taxonomy-format/Makefile | 2 +- 7 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28d4854 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.html +*.xml diff --git a/README.md b/README.md index 5ef820d..021f567 100755 --- a/README.md +++ b/README.md @@ -30,7 +30,25 @@ If you want to see how a threat intelligence can be easily expressed in MISP sta [Installing MISP](https://www.misp-project.org/download/) is also another option to see the MISP standards in action. The MISP standards are actively used in the MISP threat intelligence platform to support the complete chain from intelligence creation, sharing, distribution and synchronisation. +## Building the RFCs + +These RFCs use [mmark](https://mmark.nl/) to generate - get a release [from the Github Repo](https://github.com/miekg/mmark/releases) and make sure it's in your PATH. + +You'll also need `xml2rfc` - install using `sudo pip3 isntall xml2rfc` + +```bash +for directory in $(find . -type d -iname "misp*"); do; + echo "Building $directory..."; + cd $directory; + make; + cd ..; +done; +``` + +cd misp-core-format +make +``` + # Contribution If you want to contribute to the MISP specifications, feel free to [open an issue](https://github.com/MISP/misp-rfc/issues). - diff --git a/misp-core-format/Makefile b/misp-core-format/Makefile index 210eb88..73b05d7 100644 --- a/misp-core-format/Makefile +++ b/misp-core-format/Makefile @@ -1,4 +1,4 @@ -MMARK:=/home/adulau/git/mmark/mmark/mmark -xml2 -page +MMARK:=mmark -xml2 -page docs = $(wildcard *.md) @@ -6,4 +6,3 @@ all: $(docs) $(MMARK) $< > $<.xml xml2rfc --text $<.xml xml2rfc --html $<.xml - diff --git a/misp-galaxy-format/Makefile b/misp-galaxy-format/Makefile index 210eb88..8a7138f 100644 --- a/misp-galaxy-format/Makefile +++ b/misp-galaxy-format/Makefile @@ -1,4 +1,4 @@ -MMARK:=/home/adulau/git/mmark/mmark/mmark -xml2 -page +MMARK:=mmark -xml2 -page docs = $(wildcard *.md) diff --git a/misp-object-template-format/Makefile b/misp-object-template-format/Makefile index 210eb88..8a7138f 100644 --- a/misp-object-template-format/Makefile +++ b/misp-object-template-format/Makefile @@ -1,4 +1,4 @@ -MMARK:=/home/adulau/git/mmark/mmark/mmark -xml2 -page +MMARK:=mmark -xml2 -page docs = $(wildcard *.md) diff --git a/misp-query-format/Makefile b/misp-query-format/Makefile index 210eb88..8a7138f 100644 --- a/misp-query-format/Makefile +++ b/misp-query-format/Makefile @@ -1,4 +1,4 @@ -MMARK:=/home/adulau/git/mmark/mmark/mmark -xml2 -page +MMARK:=mmark -xml2 -page docs = $(wildcard *.md) diff --git a/misp-taxonomy-format/Makefile b/misp-taxonomy-format/Makefile index 210eb88..8a7138f 100644 --- a/misp-taxonomy-format/Makefile +++ b/misp-taxonomy-format/Makefile @@ -1,4 +1,4 @@ -MMARK:=/home/adulau/git/mmark/mmark/mmark -xml2 -page +MMARK:=mmark -xml2 -page docs = $(wildcard *.md) From f634b87a77e331d77b8acc930ee39f29808ec421 Mon Sep 17 00:00:00 2001 From: Hannah Ward Date: Tue, 19 Feb 2019 17:37:16 +0000 Subject: [PATCH 2/3] fix: Typo in build instructions --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 021f567..54ae9c8 100755 --- a/README.md +++ b/README.md @@ -45,10 +45,6 @@ for directory in $(find . -type d -iname "misp*"); do; done; ``` -cd misp-core-format -make -``` - # Contribution If you want to contribute to the MISP specifications, feel free to [open an issue](https://github.com/MISP/misp-rfc/issues). From c00895d1ca7ce5e05dcc0b99452c9cff36e49d22 Mon Sep 17 00:00:00 2001 From: Hannah Ward Date: Tue, 19 Feb 2019 17:38:40 +0000 Subject: [PATCH 3/3] Revert: Remove gitignore --- .gitignore | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 28d4854..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.html -*.xml