diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001-Correct-m4-conditionals-in-curses.m4.patch | 67 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
3 files changed, 78 insertions, 4 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Fri Sep 22 14:45:20 UTC 2017 +# Mon Oct 23 16:41:48 UTC 2017 pkgbase = openafs-modules pkgdesc = Kernel module for OpenAFS pkgver = 1.6.21.1 @@ -16,7 +16,9 @@ pkgbase = openafs-modules conflicts = openafs<1.6.6-2 options = !emptydirs source = http://openafs.org/dl/1.6.21.1/openafs-1.6.21.1-src.tar.bz2 + source = 0001-Correct-m4-conditionals-in-curses.m4.patch sha256sums = aed896b0f598e3033e9ceb2a1eae24addff9ec0bb2d713ab63945a449ded3a5a + sha256sums = 588cc4b220b7bd4783ffb44d9bfd490a67d1d4a58da20b952151fd842ca8f18d pkgname = openafs-modules diff --git a/0001-Correct-m4-conditionals-in-curses.m4.patch b/0001-Correct-m4-conditionals-in-curses.m4.patch new file mode 100644 index 000000000000..7e57fc07d4ed --- /dev/null +++ b/0001-Correct-m4-conditionals-in-curses.m4.patch @@ -0,0 +1,67 @@ +From 86ccc8d7c3bc57d5011474a8a5da228ea851104a Mon Sep 17 00:00:00 2001 +From: Benjamin Kaduk <kaduk@mit.edu> +Date: Mon, 16 Oct 2017 16:53:22 -0500 +Subject: [PATCH] Correct m4 conditionals in curses.m4 + +AS_IF does not invoke the test(1) shell builtin for us, so we must +take care to consistently use it ourself. + +While here, sprinkle some missing double-quotes around variable +expansions in AS_IF statements in this file. + +Submitted by Bastian Beischer. + +FIXES 134414 + +Change-Id: Iccfe311011f17de6317cf64abdc58b0812b81b8c +Reviewed-on: https://gerrit.openafs.org/12738 +Reviewed-by: Michael Meffie <mmeffie@sinenomine.net> +Reviewed-by: Benjamin Kaduk <kaduk@mit.edu> +Tested-by: Benjamin Kaduk <kaduk@mit.edu> +(cherry picked from commit e0c5ada214596d5adb6798682d5e280cc99f447c) +Reviewed-on: https://gerrit.openafs.org/12739 +(cherry picked from commit bc384b7d5e4818c567a64fe4a935f021d936444f) +--- + src/cf/curses.m4 | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/cf/curses.m4 b/src/cf/curses.m4 +index a0cdc60f1..dc01469f5 100644 +--- a/src/cf/curses.m4 ++++ b/src/cf/curses.m4 +@@ -55,7 +55,7 @@ AC_DEFUN([_OPENAFS_CURSES_GETMAXYX_BSD43], + dnl possibly this may need to be done as above in some cases? + AC_CHECK_FUNCS([getmaxx getmaxy], [], [_openafs_curses_bsd43=no]) + LIBS="$save_LIBS" +- AS_IF([$_openafs_curses_bsd43 = yes], [$1], [$2])]) ++ AS_IF([test "$_openafs_curses_bsd43" = yes], [$1], [$2])]) + + dnl _OPENAFS_CURSES_GETMAXYX_BSDVI([ACTION-IF-SUCCESS], [ACTION_IF_FAILURE]) + dnl test for getmaxx() and getmaxy() as from BSD curses as bodily ripped +@@ -68,7 +68,7 @@ AC_DEFUN([_OPENAFS_CURSES_GETMAXYX_BSDVI], + AC_CHECK_MEMBERS([WINDOW._maxx WINDOW._maxy], [], [_openafs_curses_bsdvi=no], + _OPENAFS_CURSES_HEADERS) + LIBS="$save_LIBS" +- AS_IF([$_openafs_curses_bsdvi = yes], [$1], [$2])]) ++ AS_IF([test "$_openafs_curses_bsdvi" = yes], [$1], [$2])]) + + dnl OPENAFS_CURSES_WINDOW_EXTENTS([ACTION-IF-SUCCESS], [ACTION_IF_FAILURE]) + dnl check for standard getmaxyx macro. failing that, try the +@@ -78,11 +78,11 @@ AC_DEFUN([OPENAFS_CURSES_WINDOW_EXTENTS], + [OPENAFS_CURSES_LIB + openafs_curses_extent=none + _OPENAFS_CURSES_GETMAXYX_XTI([openafs_curses_extent=xti]) +- AS_IF([test $openafs_curses_extent = none], ++ AS_IF([test "$openafs_curses_extent" = none], + [_OPENAFS_CURSES_GETMAXYX_BSD43([openafs_curses_extent=bsd])]) +- AS_IF([test $openafs_curses_extent = none], ++ AS_IF([test "$openafs_curses_extent" = none], + [_OPENAFS_CURSES_GETMAXYX_BSDVI([openafs_curses_extent=vi])],) +- AS_IF([test $openafs_curses_extent != none], [$1], [$2])]) ++ AS_IF([test "$openafs_curses_extent" != none], [$1], [$2])]) + + dnl The top level curses group + AC_DEFUN([OPENAFS_CURSES], +-- +2.14.2 + @@ -15,9 +15,11 @@ depends=('openafs') makedepends=('linux-headers') conflicts=('openafs-features-libafs' 'openafs<1.6.6-2') options=(!emptydirs) -source=(http://openafs.org/dl/${pkgver}/${_srcname}-${pkgver}-src.tar.bz2) +source=(http://openafs.org/dl/${pkgver}/${_srcname}-${pkgver}-src.tar.bz2 + 0001-Correct-m4-conditionals-in-curses.m4.patch) install=openafs-modules.install -sha256sums=('aed896b0f598e3033e9ceb2a1eae24addff9ec0bb2d713ab63945a449ded3a5a') +sha256sums=('aed896b0f598e3033e9ceb2a1eae24addff9ec0bb2d713ab63945a449ded3a5a' + '588cc4b220b7bd4783ffb44d9bfd490a67d1d4a58da20b952151fd842ca8f18d') # Heuristic to determine version of installed kernel # You can modify this if the heuristic fails @@ -27,8 +29,11 @@ _kernelver=$(cat ${_extramodules}/version) prepare() { cd ${srcdir}/${_srcname}-${pkgver} + # Fix curses checks during configure (https://gerrit.openafs.org/12740/) + patch -p1 < ${srcdir}/0001-Correct-m4-conditionals-in-curses.m4.patch + # Only needed when changes to configure were made - # ./regen.sh -q + ./regen.sh -q } build() { |