summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@fedoraproject.org>2009-06-20 00:52:46 +0000
committerTodd Zullinger <tmz@fedoraproject.org>2009-06-20 00:52:46 +0000
commit87ceff4e35986ecf89d9faea3cd78dde6917c051 (patch)
treead08269cb354f94a64fe2998cbff01b6208638a5
parent4387c32ff055cd3d1c3ff1c9aaef4097a3c9ac99 (diff)
downloadgit-package-87ceff4e35986ecf89d9faea3cd78dde6917c051.tar.gz
git-package-87ceff4e35986ecf89d9faea3cd78dde6917c051.tar.xz
git-package-87ceff4e35986ecf89d9faea3cd78dde6917c051.zip
Temporarily disable asciidoc's safe mode until bug 506953 is fixed
-rw-r--r--git.spec7
1 files changed, 5 insertions, 2 deletions
diff --git a/git.spec b/git.spec
index 15e8215..ba6a063 100644
--- a/git.spec
+++ b/git.spec
@@ -1,7 +1,7 @@
# Pass --without docs to rpmbuild if you don't want the documentation
Name: git
Version: 1.6.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Core git tools
License: GPLv2
Group: Development/Tools
@@ -195,7 +195,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2
# Otherwise it will rebuild in %%install due to flags changes.
%define make_git \
make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\
- ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\
+ ASCIIDOC="asciidoc --unsafe" ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\
ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\
DESTDIR=$RPM_BUILD_ROOT \\\
INSTALL="install -p" \\\
@@ -366,6 +366,9 @@ rm -rf $RPM_BUILD_ROOT
# No files for you!
%changelog
+* Fri Jun 19 2009 Todd Zullinger <tmz@pobox.com> - 1.6.3.2-3
+- Temporarily disable asciidoc's safe mode until bug 506953 is fixed
+
* Fri Jun 19 2009 Todd Zullinger <tmz@pobox.com> - 1.6.3.2-2
- Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761)