network/heimdal: Patched to fix build with texinfo-6.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 161 insertions, 4 deletions

diff --git a/network/heimdal/0e0351776a48a69ec704085e554a0653d8179452.patch b/network/heimdal/0e0351776a48a69ec704085e554a0653d8179452.patch
new file mode 100644
index 000000000000..0d00c5c2fc7d
--- /dev/null
+++ b/network/heimdal/0e0351776a48a69ec704085e554a0653d8179452.patch
@@ -0,0 +1,21 @@
+From 0e0351776a48a69ec704085e554a0653d8179452 Mon Sep 17 00:00:00 2001
+From: Eray Aslan <eray.aslan@caf.com.tr>
+Date: Mon, 8 Apr 2013 09:54:18 -0700
+Subject: [PATCH] @end should only appear at a line beginning
+
+Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
+---
+ doc/win2k.texi | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/doc/win2k.texi b/doc/win2k.texi
+index 0452b4d..0fefeee 100644
+--- a/doc/win2k.texi
++++ b/doc/win2k.texi
+@@ -311,4 +311,5 @@ Other useful programs include these:
+ 
+ @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/network/heimdal/115f88a3e7901541a67964d41bbd2a1866cfc521.patch b/network/heimdal/115f88a3e7901541a67964d41bbd2a1866cfc521.patch
new file mode 100644
index 000000000000..5c00cb86b64f
--- /dev/null
+++ b/network/heimdal/115f88a3e7901541a67964d41bbd2a1866cfc521.patch
@@ -0,0 +1,51 @@
+From 115f88a3e7901541a67964d41bbd2a1866cfc521 Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <ktdreyer@ktdreyer.com>
+Date: Thu, 8 Aug 2013 18:21:15 -0600
+Subject: [PATCH] more texinfo 5.1 hacks
+
+For hx509.texi, we need the copyright macros for both html and info.
+Just remove the "ifhtml" conditionals.
+
+For whatis.texi, texinfo 5.1 inserts the sub{} macro inline with no
+newlines, so there are errors about @html not being at the end of a
+line, etc.
+---
+ doc/hx509.texi  | 2 --
+ doc/whatis.texi | 2 ++
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/hx509.texi b/doc/hx509.texi
+index b44cbea..d050c21 100644
+--- a/doc/hx509.texi
++++ b/doc/hx509.texi
+@@ -39,14 +39,12 @@
+ @def@copyrightstart{}
+ @def@copyrightend{}
+ @end iftex
+-@ifinfo
+ @macro copynext
+ @end macro
+ @macro copyrightstart
+ @end macro
+ @macro copyrightend
+ @end macro
+-@end ifinfo
+ 
+ @page
+ @copyrightstart
+diff --git a/doc/whatis.texi b/doc/whatis.texi
+index 891e275..7d83725 100644
+--- a/doc/whatis.texi
++++ b/doc/whatis.texi
+@@ -43,9 +43,11 @@ services can authenticate each other.
+ 
+ @ifhtml
+ @macro sub{arg}
++
+ @html
+ <sub>\arg\</sub>
+ @end html
++
+ @end macro
+ @end ifhtml
+ 
diff --git a/network/heimdal/1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch b/network/heimdal/1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch
new file mode 100644
index 000000000000..835c1b1ff6c0
--- /dev/null
+++ b/network/heimdal/1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch
@@ -0,0 +1,29 @@
+From 1846c7a35d1091d3b6140c56befd7fee0a91dcbb Mon Sep 17 00:00:00 2001
+From: Love Hornquist Astrand <lha@h5l.org>
+Date: Mon, 8 Apr 2013 10:15:15 -0700
+Subject: [PATCH] make @iftex case work in texinfo-5.1
+
+---
+ doc/whatis.texi | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/doc/whatis.texi b/doc/whatis.texi
+index 8c1f45d..891e275 100644
+--- a/doc/whatis.texi
++++ b/doc/whatis.texi
+@@ -35,10 +35,11 @@ services can authenticate each other.
+ @end macro
+ @end ifinfo
+ 
+-@tex
+-@def@xsub#1{$_{#1}$}
+-@global@let@sub=@xsub
+-@end tex
++@iftex
++@macro sub{arg}
++@textsubscript{\arg\}
++@end macro
++@end iftex
+ 
+ @ifhtml
+ @macro sub{arg}
diff --git a/network/heimdal/a1d7f1f3e3cc6717f32a517053015585c47177ba.patch b/network/heimdal/a1d7f1f3e3cc6717f32a517053015585c47177ba.patch
new file mode 100644
index 000000000000..848b06717bf8
--- /dev/null
+++ b/network/heimdal/a1d7f1f3e3cc6717f32a517053015585c47177ba.patch
@@ -0,0 +1,49 @@
+From a1d7f1f3e3cc6717f32a517053015585c47177ba Mon Sep 17 00:00:00 2001
+From: Daniel Schepler <dschepler@gmail.com>
+Date: Thu, 8 Aug 2013 17:12:49 -0600
+Subject: [PATCH] fix for texinfo 5.1
+
+Signed-off-by: Ken Dreyer <ktdreyer@ktdreyer.com>
+---
+ doc/hx509.texi | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/doc/hx509.texi b/doc/hx509.texi
+index c927357..b44cbea 100644
+--- a/doc/hx509.texi
++++ b/doc/hx509.texi
+@@ -34,9 +34,20 @@
+ @subtitle 2008
+ @author Love Hörnquist Åstrand
+ 
++@iftex
+ @def@copynext{@vskip 20pt plus 1fil}
+ @def@copyrightstart{}
+ @def@copyrightend{}
++@end iftex
++@ifinfo
++@macro copynext
++@end macro
++@macro copyrightstart
++@end macro
++@macro copyrightend
++@end macro
++@end ifinfo
++
+ @page
+ @copyrightstart
+ Copyright (c) 1994-2008 Kungliga Tekniska Högskolan
+@@ -183,6 +194,13 @@ This manual is for version @value{VERSION} of hx509.
+ * CMS signing and encryption::
+ * Certificate matching::
+ * Software PKCS 11 module::
++* Creating a CA certificate::
++* Issuing certificates::
++* Issuing CRLs::
++* Application requirements::
++* CMS background::
++* Matching syntax::
++* How to use the PKCS11 module::
+ 
+ @detailmenu
+  --- The Detailed Node Listing ---
diff --git a/network/heimdal/heimdal.SlackBuild b/network/heimdal/heimdal.SlackBuild
index fe121bbff044..8a0ebe70b474 100644
--- a/network/heimdal/heimdal.SlackBuild
+++ b/network/heimdal/heimdal.SlackBuild
@@ -52,10 +52,17 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
-  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
-  -o -perm 400 \) -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix build failure with texinfo-6.1
+# https://github.com/heimdal/heimdal/commits/master/doc
+patch -p1 < $CWD/0e0351776a48a69ec704085e554a0653d8179452.patch
+patch -p1 < $CWD/1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch
+patch -p1 < $CWD/a1d7f1f3e3cc6717f32a517053015585c47177ba.patch
+patch -p1 < $CWD/115f88a3e7901541a67964d41bbd2a1866cfc521.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \