From 4e258a987edeb43d43ba6f4d3e9c4b783f2ce6f5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:57:36 -0400
Subject: [PATCH 1/4] common/travis/xpkgdiff.sh: add script to compare pkgs to
 previous version

---
 common/travis/xpkgdiff.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 common/travis/xpkgdiff.sh

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
new file mode 100755
index 000000000000..e45c4b3dea92
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+
+while read -r pkg; do
+	for subpkg in $(xsubpkg $pkg); do
+		if [ xbps-query --repository=$HOME/hostdir/binpkgs \
+						--repository=$HOME/hostdir/binpkgs/nonfree \
+						-i "$subpkg" >&/dev/null ]; then
+			/bin/echo -e "\x1b[32mFile Diff of $subpkg:\x1b[0m"
+			xpkgdiff -f $subpkg
+			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
+			xpkgdiff -S $subpkg
+			/bin/echo -e "\x1b[32m Diff of $subpkg:\x1b[0m"
+			xpkgdiff -xt $subpkg
+		else
+			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From 6b94f0ed99a436227a7d3eb32fc3ea1a7d1ec2a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:59:55 -0400
Subject: [PATCH 2/4] .github/workflows/build.yaml: add xpkgdiff CI step

---
 .github/workflows/build.yaml | 8 ++++++++
 common/travis/xpkgdiff.sh    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..28881fc543ed 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -94,6 +94,14 @@ jobs:
           "$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH"
           )
 
+      - name: Compare to previous version
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
       - name: Verify repository state
         run: |
           (
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index e45c4b3dea92..660e6ed6490f 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -13,7 +13,7 @@ while read -r pkg; do
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
 			xpkgdiff -S $subpkg
-			/bin/echo -e "\x1b[32m Diff of $subpkg:\x1b[0m"
+			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
 			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"

From e99eb67106a93340a73e29a98bf7997ec7b40a6d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:01:02 -0400
Subject: [PATCH 3/4] chezmoi: test

---
 srcpkgs/chezmoi/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index bacfc8c9b294..1aa7f6d03cc3 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,12 +1,11 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.15.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"
-go_ldflags="-X main.version=${version} -X main.commit=v${version}
- -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps"
+go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.builtBy=xbps"
 short_desc="Manage your dotfiles across multiple machines, securely"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
@@ -14,7 +13,13 @@ homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
 checksum=0100dcf8b70774595f56859e5d1b635319ba584ad7b280946352be328f36d679
 
-export CGO_ENABLED=1
+pre_build() {
+	local _date
+	if [ "$SOURCE_DATE_EPOCH" ]; then
+		_date="$(date --utc --date "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d")"
+		go_ldflags="$go_ldflags -X main.date=${_date}"
+	fi
+}
 
 post_install() {
 	vlicense LICENSE

From e85594beb52de06fd5acfe6dc583f799d6cbd6b3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:04:37 -0400
Subject: [PATCH 4/4] tmp

---
 common/travis/xpkgdiff.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 660e6ed6490f..6ed6d0ba8207 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -2,13 +2,13 @@
 #
 # xpkgdiff.sh
 
-export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
-		if [ xbps-query --repository=$HOME/hostdir/binpkgs \
-						--repository=$HOME/hostdir/binpkgs/nonfree \
-						-i "$subpkg" >&/dev/null ]; then
+		if xbps-query --repository=$HOME/hostdir/binpkgs \
+					  --repository=$HOME/hostdir/binpkgs/nonfree \
+					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[32mFile Diff of $subpkg:\x1b[0m"
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
@@ -16,7 +16,7 @@ while read -r pkg; do
 			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
-			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
 		fi
 	done
 done < /tmp/templates