From 7cca2b374804073246108832b79e5d41315d7acc Mon Sep 17 00:00:00 2001
From: William Holtz <wholtz@lygos.com>
Date: Tue, 13 Mar 2018 11:59:15 -0700
Subject: [PATCH] Pull munkitools pkg from github

Currently the munkitools pkg is downloaded from munkibuilds.org, which
does not contain the official stable builds. This changes the location
for the pkg download to github.com where the official stable builds
are available.
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0f217da..f5252ca 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ SIMIAN=simian-${SIMIAN_VERSION}
 SDIST_TAR=dist/simian-${SIMIAN_VERSION}.tar
 SDIST=${SDIST_TAR}.gz
 MUNKI_VERSION=3.0.3.3352
+MUNKI_VERSION_SHORT=$(shell echo "${MUNKI_VERSION}" | sed -E "s%^([0-9]+\.[0-9]+\.[0-9]+).*%\1%")
 MUNKI=munkitools-${MUNKI_VERSION}
 MUNKIFILE=${MUNKI}.pkg
 PYTHON_VERSION=2.7
@@ -90,7 +91,7 @@ server_config:
 client_config: settings_check
 
 ${MUNKIFILE}:
-	curl -o $@ https://munkibuilds.org/${MUNKI_VERSION}/$@
+	curl -L -o $@ https://github.com/munki/munki/releases/download/v${MUNKI_VERSION_SHORT}/$@
 	@xar -t -f "$@" > /dev/null || ( rm -f "$@" ; exit 1)
 
 add_munkicontents: os_check ${MUNKIFILE}