[PATCH] Parametrize asciidoc and add --unsafe
- From
- Pavel Roskin <proski@gnu.org>
- Date
- Jan 24, 2006, 22:15 UTC
- Message-ID
- <1138140946.19065.2.camel@dv>
Including files from the parent directory is considered unsafe by asciidoc 7.1.0. This is used in git.txt, which includes ../README.
Since git is developed openly, we shouldn't be afraid of exploits lurking in the docs. Create a make variable ASCIIDOC and use it to always call asciidoc with the --unsafe option.
Signed-off-by: Pavel Roskin <proski@gnu.org> ---
Documentation/Makefile | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile index a65fb1b..391f583 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -28,6 +28,8 @@ man7=$(mandir)/man7 INSTALL?=install +ASCIIDOC = asciidoc --unsafe + # # Please note that there is a minor bug in asciidoc. # The version after 6.0.3 _will_ include the patch found here: @@ -69,20 +71,20 @@ clean: rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep %.html : %.txt - asciidoc -b xhtml11 -d manpage -f asciidoc.conf $< + $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $< %.1 %.7 : %.xml xmlto man $< %.xml : %.txt - asciidoc -b docbook -d manpage -f asciidoc.conf $< + $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf $< git.html: git.txt ../README glossary.html : glossary.txt sort_glossary.pl cat $< | \ perl sort_glossary.pl | \ - asciidoc -b xhtml11 - > glossary.html + $(ASCIIDOC) -b xhtml11 - > glossary.html howto-index.txt: howto-index.sh $(wildcard howto/*.txt) rm -f $@+ $@ @@ -90,13 +92,13 @@ howto-index.txt: howto-index.sh $(wildca mv $@+ $@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt - asciidoc -b xhtml11 $*.txt + $(ASCIIDOC) -b xhtml11 $*.txt WEBDOC_DEST = /pub/software/scm/git/docs $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt rm -f $@+ $@ - sed -e '1,/^$$/d' $? | asciidoc -b xhtml11 - >$@+ + sed -e '1,/^$$/d' $? | $(ASCIIDOC) -b xhtml11 - >$@+ mv $@+ $@ install-webdoc : html
-- Regards, Pavel Roskin