summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2013-04-08 13:47:51 +0000
committerEray Aslan <eras@gentoo.org>2013-04-08 13:47:51 +0000
commit1eaab52229b900456ba3ff247470c5bbf6e0f3b6 (patch)
tree7dc2a40c5f897d4cb3a023bd8f081f1d0145eceb /app-crypt/heimdal
parentPax mark all unconditionally for hardened support (diff)
downloadgentoo-2-1eaab52229b900456ba3ff247470c5bbf6e0f3b6.tar.gz
gentoo-2-1eaab52229b900456ba3ff247470c5bbf6e0f3b6.tar.bz2
gentoo-2-1eaab52229b900456ba3ff247470c5bbf6e0f3b6.zip
Fix building with texinfo-5 - bug #465016
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)
Diffstat (limited to 'app-crypt/heimdal')
-rw-r--r--app-crypt/heimdal/ChangeLog6
-rw-r--r--app-crypt/heimdal/files/heimdal_texinfo-5.patch22
-rw-r--r--app-crypt/heimdal/heimdal-1.5.3.ebuild3
3 files changed, 29 insertions, 2 deletions
diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index bbf9f266fd8e..0e66b8a59fd6 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/heimdal
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.210 2013/03/11 11:51:43 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.211 2013/04/08 13:47:50 eras Exp $
+
+ 08 Apr 2013; Eray Aslan <eras@gentoo.org> +files/heimdal_texinfo-5.patch,
+ heimdal-1.5.3.ebuild:
+ Fix building with texinfo-5 - bug #465016
11 Mar 2013; Eray Aslan <eras@gentoo.org> -files/CVE-2011-4862.patch,
-files/heimdal-kadmind.initd-r1, -files/heimdal-kdc.initd-r1,
diff --git a/app-crypt/heimdal/files/heimdal_texinfo-5.patch b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
new file mode 100644
index 000000000000..3aaf2122d9b6
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
@@ -0,0 +1,22 @@
+--- a/doc/whatis.texi 2012-12-10 00:06:44.000000000 +0200
++++ b/doc/whatis.texi 2013-04-08 15:11:44.646165777 +0300
+@@ -36,8 +36,8 @@
+ @end ifinfo
+
+ @tex
+-@def@xsub#1{$_{#1}$}
+-@global@let@sub=@xsub
++@@def@@xsub#1@{$_@{#1@}$@}
++@@global@@let@@sub=@@xsub
+ @end tex
+
+ @ifhtml
+--- a/doc/win2k.texi 2012-12-10 00:06:44.000000000 +0200
++++ b/doc/win2k.texi 2013-04-08 16:17:21.316961234 +0300
+@@ -311,4 +311,5 @@
+
+ @itemize @bullet
+ @item pwdump2
+-@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize
++@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}
++@end itemize
diff --git a/app-crypt/heimdal/heimdal-1.5.3.ebuild b/app-crypt/heimdal/heimdal-1.5.3.ebuild
index be99e866f83a..71ebfcdc8493 100644
--- a/app-crypt/heimdal/heimdal-1.5.3.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.3.ebuild,v 1.13 2013/03/11 07:38:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.3.ebuild,v 1.14 2013/04/08 13:47:50 eras Exp $
EAPI=4
# PYTHON_BDEPEND="2"
@@ -51,6 +51,7 @@ src_prepare() {
epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
epatch "${FILESDIR}/heimdal_link_order.patch"
epatch "${FILESDIR}/heimdal_missing_symbols.patch"
+ epatch "${FILESDIR}/heimdal_texinfo-5.patch"
eautoreconf
}