From beb21fd9447f273cc956ea74d98bfe29d16244f0 Mon Sep 17 00:00:00 2001
From: Shulhan <ms@kilabit.info>
Date: Wed, 6 Sep 2023 17:18:28 +0700
Subject: all: update to release 20251022.00

Changes,

* Add package boost as one of the dependencies

* Remove the prepare and checkdepends. The latest test does not run
  with the following error:

  *** No rule to make target '/usr/src/googletest/googletest//src/gtest-all.cc',
    needed by 'gtest-all.o'.  Stop.

* Remove patch on the test/Makefile since it does not relevant anymore.

* Update the build commands, following google-compute-engine-oslogin.spec
  in the packaging directory.

* Remove option --now in post_install and pre_remove script.
  In Arch Linux we did not start or stop the service manually during
  installation or removal.

* Add common tasks in the Makefile.
---
 .SRCINFO                              | 10 +++++-----
 Makefile                              | 11 +++++++++++
 PKGBUILD                              | 26 +++++++++++++-------------
 google-compute-engine-oslogin.install |  4 ++--
 4 files changed, 31 insertions(+), 20 deletions(-)
 create mode 100644 Makefile

diff --git a/.SRCINFO b/.SRCINFO
index 07772d2..a75050d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = google-compute-engine-oslogin
 	pkgdesc = OS Login Guest Environment for Google Compute Engine
-	pkgver = 20220721.00
+	pkgver = 20251022.00
 	pkgrel = 1
 	url = https://github.com/GoogleCloudPlatform/guest-oslogin
 	install = google-compute-engine-oslogin.install
 	arch = x86_64
 	license = Apache
-	checkdepends = gtest
+	depends = boost
 	depends = curl
 	depends = json-c
 	depends = pam
-	source = google-compute-engine-oslogin-20220721.00.tar.gz::https://github.com/GoogleCloudPlatform/guest-oslogin/archive/20220721.00.tar.gz
+	source = google-compute-engine-oslogin-20251022.00.tar.gz::https://github.com/GoogleCloudPlatform/guest-oslogin/archive/20251022.00.tar.gz
 	source = google-compute-engine-oslogin.install
-	sha256sums = 17a0cd15df917c6ae29daa299d04e2e95e8b891918d2976b31b6c13398f0bc37
-	sha256sums = 3e488f66f6ddc5882d731bd951391efe588c1fbb19afcf4de5283ec7fd481039
+	sha256sums = 9c103feef0687c0b7b76197c83956999ea422fe17144c6e3c1864c74af5d12af
+	sha256sums = 041a40fb7f7f1e22241734ecaa1d57190996b09950a342db3fe6f2bca7d70533
 
 pkgname = google-compute-engine-oslogin
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..5e33b7a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+.PHONY: all
+all:
+	makepkg --syncdeps
+
+.PHONY: release
+release: check
+	makepkg --printsrcinfo > .SRCINFO
+
+.PHONY: check
+check:
+	namcap PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index f21ce56..ffc3648 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,30 +14,30 @@
 
 # Maintainer: Lorenzo Castelli <lcastelli@google.com>
 # Maintainer: Samuel Littley <samuellittley@google.com>
+# Maintainer: Shulhan <ms@kilabit.info>
 
 pkgname='google-compute-engine-oslogin'
-pkgver=20220721.00
+pkgver=20251022.00
 pkgrel=1
 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')
-checkdepends=('gtest')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/GoogleCloudPlatform/guest-oslogin/archive/$pkgver.tar.gz"
-        'google-compute-engine-oslogin.install')
-sha256sums=('17a0cd15df917c6ae29daa299d04e2e95e8b891918d2976b31b6c13398f0bc37'
-            '3e488f66f6ddc5882d731bd951391efe588c1fbb19afcf4de5283ec7fd481039')
+depends=('boost' 'curl' 'json-c' 'pam')
+source=(
+	"$pkgname-$pkgver.tar.gz::https://github.com/GoogleCloudPlatform/guest-oslogin/archive/$pkgver.tar.gz"
+        'google-compute-engine-oslogin.install'
+)
+sha256sums=(
+	'9c103feef0687c0b7b76197c83956999ea422fe17144c6e3c1864c74af5d12af'
+	'041a40fb7f7f1e22241734ecaa1d57190996b09950a342db3fe6f2bca7d70533'
+)
 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
+	chmod +x find-requires
+	make LDLIBS="-lcurl -ljson-c -lboost_regex"
 }
 
 package() {
diff --git a/google-compute-engine-oslogin.install b/google-compute-engine-oslogin.install
index d942569..3f16607 100644
--- a/google-compute-engine-oslogin.install
+++ b/google-compute-engine-oslogin.install
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 post_install() {
-	systemctl enable --now google-oslogin-cache.timer
+	systemctl enable google-oslogin-cache.timer
 }
 
 pre_remove() {
-	systemctl disable --now google-oslogin-cache.timer
+	systemctl disable google-oslogin-cache.timer
 }
-- 
cgit v1.3