Fix build when ncurses was compiled with --with-termlib=tinfo

https://rt.central.org/rt/Ticket/Display.html?id=134420

3 files changed, 30 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a6be175dbb6..90d3515ee9f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Oct 23 16:39:52 UTC 2017
+# Tue Oct 24 15:42:06 UTC 2017
 pkgbase = openafs
 	pkgdesc = Open source implementation of the AFS distributed file system
 	pkgver = 1.6.21.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.openafs.org
 	install = openafs.install
 	arch = i686
@@ -26,6 +26,7 @@ pkgbase = openafs
 	source = 0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
 	source = 0004-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch
 	source = 0005-Correct-m4-conditionals-in-curses.m4.patch
+	source = tinfo.patch
 	source = tmpfiles.d-openafs.conf
 	sha256sums = aed896b0f598e3033e9ceb2a1eae24addff9ec0bb2d713ab63945a449ded3a5a
 	sha256sums = a8b2482eaa3bd5a3521b8dfde69337e5e01b1b1626c0a2e0a489049834a2983a
@@ -34,6 +35,7 @@ pkgbase = openafs
 	sha256sums = 01671cee2ca3e9c42e1b5860c8373e55dd7794b8291486f8659c51e4bd4ceddc
 	sha256sums = 88303daac553f2a3d24969a8dbea87bd70807b2267d4437092cba60968ddf2a5
 	sha256sums = 7020a99bbb620ca53b24c793413a0579edb61f749f487c4b9325e7ed76aee14c
+	sha256sums = f147ba626028e70ed151100e951bc0f19f3ac941153d6acf03cf0e0416aea925
 	sha256sums = 5ef549180d1ac4e9530b65df7ddbdc1eceac6d6d6398fb2f32b06e96c1d9b5f0
 
 pkgname = openafs
diff --git a/PKGBUILD b/PKGBUILD
index 82f655905f50..a8babf52b287 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=openafs
 pkgver=1.6.21.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source implementation of the AFS distributed file system"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.openafs.org"
@@ -28,6 +28,7 @@ source=(http://openafs.org/dl/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2
         0003-Do-not-install-kauth-manpages-when-kauth-is-disabled.patch
         0004-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch
         0005-Correct-m4-conditionals-in-curses.m4.patch
+        tinfo.patch
         tmpfiles.d-openafs.conf)
 sha256sums=('aed896b0f598e3033e9ceb2a1eae24addff9ec0bb2d713ab63945a449ded3a5a'
             'a8b2482eaa3bd5a3521b8dfde69337e5e01b1b1626c0a2e0a489049834a2983a'
@@ -36,6 +37,7 @@ sha256sums=('aed896b0f598e3033e9ceb2a1eae24addff9ec0bb2d713ab63945a449ded3a5a'
             '01671cee2ca3e9c42e1b5860c8373e55dd7794b8291486f8659c51e4bd4ceddc'
             '88303daac553f2a3d24969a8dbea87bd70807b2267d4437092cba60968ddf2a5'
             '7020a99bbb620ca53b24c793413a0579edb61f749f487c4b9325e7ed76aee14c'
+            'f147ba626028e70ed151100e951bc0f19f3ac941153d6acf03cf0e0416aea925'
             '5ef549180d1ac4e9530b65df7ddbdc1eceac6d6d6398fb2f32b06e96c1d9b5f0')
 
 # If you need the kauth tools set this to 1. But be aware that these tools
@@ -58,6 +60,9 @@ prepare() {
   # Fix curses checks during configure (https://gerrit.openafs.org/12740/)
   patch -p1 < ${srcdir}/0005-Correct-m4-conditionals-in-curses.m4.patch
 
+  # Fix build when ncurses was compiled with --with-termlib=tinfo (https://rt.central.org/rt/Ticket/Display.html?id=134420)
+  patch -p1 < ${srcdir}/tinfo.patch
+
   # Only needed when changes to configure were made
   ./regen.sh -q
 }
diff --git a/tinfo.patch b/tinfo.patch
new file mode 100644
index 000000000000..d8e1117d5299
--- /dev/null
+++ b/tinfo.patch
@@ -0,0 +1,20 @@
+diff --git a/src/cf/curses.m4 b/src/cf/curses.m4
+index dc01469f5..352edf9c7 100644
+--- a/src/cf/curses.m4
++++ b/src/cf/curses.m4
+@@ -16,11 +16,15 @@ AC_DEFUN([OPENAFS_CURSES_LIB],
+ [AC_CACHE_VAL([openafs_cv_curses_lib],
+    [save_LIBS="$LIBS"
+     openafs_cv_curses_lib=
++    openafs_cv_tinfo_lib=
+     AC_CHECK_LIB([ncurses], [initscr], [openafs_cv_curses_lib=-lncurses])
+     AS_IF([test "x$openafs_cv_curses_lib" = x],
+ 	  [AC_CHECK_LIB([Hcurses], [initscr], [openafs_cv_curses_lib=-lHcurses])])
+     AS_IF([test "x$openafs_cv_curses_lib" = x],
+ 	  [AC_CHECK_LIB([curses], [initscr], [openafs_cv_curses_lib=-lcurses])])
++    AC_CHECK_LIB([tinfo], [LINES], [openafs_cv_tinfo_lib=-ltinfo])
++    AS_IF([test "x$openafs_cv_tinfo_lib" != x],
++          [openafs_cv_curses_lib="$openafs_cv_curses_lib $openafs_cv_tinfo_lib"])
+     LIBS="$save_LIBS"])
+  LIB_curses="$openafs_cv_curses_lib"
+  AC_SUBST(LIB_curses)