From c8628cd4b8051ad7fcae6145855e5d755623d087 Mon Sep 17 00:00:00 2001
From: Lorenzo Castelli <lcastelli@google.com>
Date: Mon, 24 Aug 2020 02:09:36 +0000
Subject: Updates to version 20200819.

---
 .SRCINFO                              | 12 ++++++++----
 PKGBUILD                              | 20 ++++++++++++++------
 google-compute-engine-oslogin.install | 21 +++++++++++++++++++++
 3 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 google-compute-engine-oslogin.install

diff --git a/.SRCINFO b/.SRCINFO
index 0e6e795..de23e09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
 pkgbase = google-compute-engine-oslogin
-	pkgdesc = Google Compute Engine OS login support
-	pkgver = 20200507.00
+	pkgdesc = OS Login Guest Environment for Google Compute Engine
+	pkgver = 20200819.00
 	pkgrel = 1
 	url = https://github.com/GoogleCloudPlatform/guest-oslogin
+	install = google-compute-engine-oslogin.install
 	arch = x86_64
 	license = Apache
+	checkdepends = gtest
 	depends = curl
 	depends = json-c
 	depends = pam
-	source = google-compute-engine-oslogin-20200507.00.tar.gz::https://github.com/GoogleCloudPlatform/guest-oslogin/archive/20200507.00.tar.gz
-	sha256sums = d75b72bc465554d8b68c2b604fdb2270619b20be9d1a0de5d6859763719f2ab3
+	source = google-compute-engine-oslogin-20200819.00.tar.gz::https://github.com/GoogleCloudPlatform/guest-oslogin/archive/20200819.00.tar.gz
+	source = google-compute-engine-oslogin.install
+	sha256sums = 11be57b2573dea6ca2f823256db9e78c2a8fbfebd0136dd974a8536ff09ac303
+	sha256sums = b7d7d409a22602967c110ed80293223f904737e3683b0b7cd07fe94a2c52fb8d
 
 pkgname = google-compute-engine-oslogin
 
diff --git a/PKGBUILD b/PKGBUILD
index 86349a2..a9aff72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,24 +16,32 @@
 # Maintainer: Samuel Littley <samuellittley@google.com>
 
 pkgname='google-compute-engine-oslogin'
-pkgver=20200507.00
+pkgver=20200819.00
 pkgrel=1
-pkgdesc='Google Compute Engine OS login support'
+pkgdesc='OS Login Guest Environment for Google Compute Engine'
 arch=('x86_64')
 url='https://github.com/GoogleCloudPlatform/guest-oslogin'
 license=('Apache')
 depends=('curl' 'json-c' 'pam')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/GoogleCloudPlatform/guest-oslogin/archive/$pkgver.tar.gz")
-sha256sums=('d75b72bc465554d8b68c2b604fdb2270619b20be9d1a0de5d6859763719f2ab3')
+checkdepends=('gtest')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/GoogleCloudPlatform/guest-oslogin/archive/$pkgver.tar.gz"
+        'google-compute-engine-oslogin.install')
+sha256sums=('11be57b2573dea6ca2f823256db9e78c2a8fbfebd0136dd974a8536ff09ac303'
+            'b7d7d409a22602967c110ed80293223f904737e3683b0b7cd07fe94a2c52fb8d')
+install='google-compute-engine-oslogin.install'
 
 build() {
 	cd "guest-oslogin-$pkgver"
 	make
 }
 
+check() {
+	cd "guest-oslogin-$pkgver"
+	make GTEST_DIR=/usr/src/googletest non_network_tests
+}
+
 package() {
 	cd "guest-oslogin-$pkgver"
-	make DESTDIR="$pkgdir/" SYSTEMDDIR=/usr/lib/systemd/system \
+	make VERSION="$pkgver" DESTDIR="$pkgdir/" SYSTEMDDIR=/usr/lib/systemd/system \
 		PRESETDIR=/usr/lib/systemd/system-preset install
-	rm -r "$pkgdir/usr/lib/systemd/system-preset"
 }
diff --git a/google-compute-engine-oslogin.install b/google-compute-engine-oslogin.install
new file mode 100644
index 0000000..28af10d
--- /dev/null
+++ b/google-compute-engine-oslogin.install
@@ -0,0 +1,21 @@
+# Copyright 2020 Google LLC
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     https://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+post_install() {
+	systemctl enable --now google-oslogin-cache.timer
+}
+
+pre_remove() {
+	systemctl disable --now google-oslogin-cache.timer
+}
-- 
cgit v1.3