From: Benjamin Kaduk <kaduk@mit.edu>
Date: Wed, 4 Jul 2018 17:03:32 +0000 (-0500)
Subject: Supply arm64 sysname and related cleanup
X-Git-Tag: debian/1.8.1-1~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=24ca2afff99d6cd17903c71d4775567b94fbd423;p=packages%2Fo%2Fopenafs.git

Supply arm64 sysname and related cleanup

Get closer to building for arm64.

Also remove some additional pre-linux-2.6 cruft that is no longer
relevant.

Change-Id: Ib01af61b3d85a3a22d42a2c76bf18e0122eaf8aa
---

diff --git a/debian/changelog b/debian/changelog
index ee54b4670..e84039ef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openafs (1.8.1~pre2-2) UNRELEASED; urgency=medium
+
+  * Supply sysname generation for arm64 to get further in the build.
+
+ -- Benjamin Kaduk <kaduk@mit.edu>  Wed, 04 Jul 2018 12:04:30 -0500
+
 openafs (1.8.1~pre2-1) unstable; urgency=medium
 
   * New upstream prerelease:
diff --git a/debian/module/sysname b/debian/module/sysname
index b686ae88f..0ea207c41 100755
--- a/debian/module/sysname
+++ b/debian/module/sysname
@@ -1,134 +1,41 @@
 #!/bin/sh
 
-if [ x"$KVERS" = x ] ; then
-    echo "ERROR: no kernel version" >&2
-    echo "  ($KSRC/include/linux/version.h not found?)" >&2
-    echo UNKNOWN
-    exit 1
-fi
-
 case ${ARCH:-`uname -m`} in
 alpha)
-    case $KVERS in
-    2.2*)
-        echo alpha_linux_22
-        ;;
-    2.4*)
-        echo alpha_linux_24
-        ;;
-    2.6*)
-        echo alpha_linux_26
-        ;;
-    esac
+    echo alpha_linux_26
     ;;
 arm|armel|armhf|armv5tel)
-    case $KVERS in
-    2.4*)
-        echo arm_linux24
-        ;;
-    2.6*)
-        echo arm_linux26
-        ;;
-    esac
+    echo arm_linux26
+    ;;
+arm64)
+    echo arm64_linux26
     ;;
 i[3456]86)
-    case $KVERS in
-    2.2*)
-        echo i386_linux22
-        ;;
-    2.4*)
-        echo i386_linux24
-        ;;
-    2.6*)
-        echo i386_linux26
-        ;;
-    esac
+    echo i386_linux26
     ;;
 ia64)
-    case $KVERS in
-    2.4*)
-        echo ia64_linux24
-        ;;
-    2.6*)
-        echo ia64_linux26
-        ;;
-    esac
+    echo ia64_linux26
     ;;
 ppc)
-    case $KVERS in
-    2.2*)
-        echo ppc_linux22
-        ;;
-    2.4*)
-        echo ppc_linux24
-        ;;
-    2.6)
-        echo ppc_linux26
-        ;;
-    esac
+    echo ppc_linux26
     ;;
 ppc64)
-    case $KVERS in
-    2.4*)
-        echo ppc64_linux24
-        ;;
-    2.6*)
-        echo ppc64_linux26
-        ;;
-    esac
+    echo ppc64_linux26
     ;;
 s390)
-    case $KVERS in
-    2.4*)
-        echo s390_linux24
-        ;;
-    2.6*)
-        echo s390_linux26
-        ;;
-    esac
+    echo s390_linux26
     ;;
 s390x)
-    case $KVERS in
-    2.4*)
-        echo s390x_linux24
-        ;;
-    2.6*)
-        echo s390x_linux26
-        ;;
-    esac
+    echo s390x_linux26
     ;;
 sparc)
-    case $KVERS in
-    2.2*)
-        echo sparc_linux22
-        ;;
-    2.4*)
-        echo sparc_linux24
-        ;;
-    esac
+    echo sparc_linux24
     ;;
 sparc64)
-    case $KVERS in
-    2.2*)
-        echo sparc64_linux22
-        ;;
-    2.4*)
-        echo sparc64_linux24
-        ;;
-    2.6*)
-        echo sparc64_linux26
-        ;;
-    esac
+    echo sparc64_linux26
     ;;
 x86_64)
-    case $KVERS in
-    2.4*)
-        echo amd64_linux24
-        ;;
-    2.6*)
-        echo amd64_linux26
-        ;;
-    esac
+    echo amd64_linux26
     ;;
 *)
     echo "ERROR: unsupported architecture" >&2
diff --git a/debian/sysname b/debian/sysname
index f6b2a5171..0db50fe3a 100755
--- a/debian/sysname
+++ b/debian/sysname
@@ -12,6 +12,9 @@ alpha)
 arm|armel|armhf|armv5tel)
     echo arm_linux26
     ;;
+arm64)
+    echo arm64_linux26
+    ;;
 amd64)
     echo amd64_linux26
     ;;
@@ -34,7 +37,7 @@ s390x)
     echo s390x_linux26
     ;;
 sparc|sparc64)
-    echo sparc_linux24
+    echo sparc_linux26
     ;;
 *)
     echo "ERROR: unsupported architecture" >&2
diff --git a/src/auth/userok.c b/src/auth/userok.c
index 8a7d4a4b8..b54d10656 100644
--- a/src/auth/userok.c
+++ b/src/auth/userok.c
@@ -470,7 +470,7 @@ ParseLine(char *buffer, struct rx_identity *user)
 	if (decodedName == NULL)
 	    return ENOMEM;
 
-	len = base64_decode(ename, decodedName);
+	len = rk_base64_decode(ename, decodedName);
 	if (len<0) {
 	    free(decodedName);
 	    return EINVAL;
@@ -571,7 +571,7 @@ afsconf_AddIdentity(struct afsconf_dir *adir, struct rx_identity *user)
     if (user->kind == RX_ID_KRB4) {
 	fprintf(tf, "%s\n", user->displayName);
     } else {
-	base64_encode(user->exportedName.val, user->exportedName.len,
+	rk_base64_encode(user->exportedName.val, user->exportedName.len,
 		      &ename);
 	fprintf(tf, " %d %s %s\n", user->kind, ename, user->displayName);
 	free(ename);