From 0bed87a15db11bccb693b3a54f704ee5751ae553 Mon Sep 17 00:00:00 2001
From: Marcio Barbosa <mbarbosa@sinenomine.net>
Date: Sun, 23 Oct 2016 12:52:49 -0700
Subject: [PATCH] macos: packaging support for MacOS X 10.12

This commit introduces the new set of changes / files required to
successfully create the dmg installer on OS X 10.12 "Sierra".

Change-Id: I8e715240c4b230c39c26c418324c0184268e1f73
Reviewed-on: https://gerrit.openafs.org/12420
Reviewed-by: Joe Gorse <jhgorse@gmail.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
---
 src/packaging/MacOS/InstallationCheck.16      | 19 +++++++++++++++++++
 .../MacOS/InstallationCheck.strings.16        |  1 +
 src/packaging/MacOS/ReadMe.rtf.16             |  7 +++++++
 src/packaging/MacOS/pkgbuild.sh.in            |  4 ++++
 4 files changed, 31 insertions(+)
 create mode 100644 src/packaging/MacOS/InstallationCheck.16
 create mode 100644 src/packaging/MacOS/InstallationCheck.strings.16
 create mode 100644 src/packaging/MacOS/ReadMe.rtf.16

diff --git a/src/packaging/MacOS/InstallationCheck.16 b/src/packaging/MacOS/InstallationCheck.16
new file mode 100644
index 000000000..e1ac3115e
--- /dev/null
+++ b/src/packaging/MacOS/InstallationCheck.16
@@ -0,0 +1,19 @@
+#!/bin/sh
+majorvers=`uname -r | sed 's/\..*//'`
+if [ $majorvers -ne 16 ]; then
+	exit 112
+fi
+
+# check for temporary versions of ThisCell and CellAlias
+# and move them aside
+tmpthiscell=/private/tmp/org.OpenAFS.Install.ThisCell.$USER
+tmpcellalias=/private/tmp/org.OpenAFS.Install.CellAlias.$USER
+date=`date +%Y%m%d%H%M`
+if [ -e $tmpthiscell ]; then
+    mv -f $tmpthiscell $tmpthiscell.$date
+fi
+if [ -e $tmpcellalias ]; then
+    mv -f $tmpcellalias $tmpcellalias.$date
+fi
+
+exit 0
diff --git a/src/packaging/MacOS/InstallationCheck.strings.16 b/src/packaging/MacOS/InstallationCheck.strings.16
new file mode 100644
index 000000000..aab93eda9
--- /dev/null
+++ b/src/packaging/MacOS/InstallationCheck.strings.16
@@ -0,0 +1 @@
+"16" = "This OpenAFS release requires Sierra (10.12)";
diff --git a/src/packaging/MacOS/ReadMe.rtf.16 b/src/packaging/MacOS/ReadMe.rtf.16
new file mode 100644
index 000000000..3139cb702
--- /dev/null
+++ b/src/packaging/MacOS/ReadMe.rtf.16
@@ -0,0 +1,7 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf320
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh9000\viewkind0
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\fs24 \cf0 This release of OpenAFS is targeted at MacOS 10.12 (Sierra) and is not recommended for use with any other version.}
diff --git a/src/packaging/MacOS/pkgbuild.sh.in b/src/packaging/MacOS/pkgbuild.sh.in
index 67f3cc99f..36ec5d2d2 100644
--- a/src/packaging/MacOS/pkgbuild.sh.in
+++ b/src/packaging/MacOS/pkgbuild.sh.in
@@ -127,6 +127,10 @@ elif [ x"$majorvers" = x15 ]; then
     RELNAME="ElCapitan"
     THISREL=11
 
+elif [ x"$majorvers" = x16 ]; then
+    RELNAME="Sierra"
+    THISREL=12
+
 elif [ x"$majorvers" = x ] ; then
     echo "Error running uname" >&2
     exit 1
-- 
2.39.5