hosts-gen-0.9.20191123.2

2 files changed, 25 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94390bfba630..366bb8d94301 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = hosts-gen
 	pkgdesc = A little framework to generate /etc/hosts from /etc/hosts.d
-	pkgver = 0.9
-	pkgrel = 2
-	url = http://git.r-36.net/hosts-gen/
+	pkgver = 0.9.20191123.2
+	pkgrel = 1
+	url = http://r-36.net/scm/hosts-gen/
 	install = hosts-gen.install
 	arch = any
 	license = GPL3
 	depends = coreutils
-	source = http://git.r-36.net/hosts-gen/snapshot/hosts-gen-d3015d319d378390139455731b974569fbc2cd40.tar.bz2
+	source = hosts-gen::git://r-36.net/hosts-gen#commit=562b4af551efc7249cb68f6d4b8909daf2ce7ce6
 	source = hosts-gen.path
 	source = hosts-gen.service
-	md5sums = 534edf642f15df0a073a716967724065
+	md5sums = SKIP
 	md5sums = 470be01a8490fc054fb0a04d3a74eed1
 	md5sums = 12ed5fdea9f047bb03e61e8f846c641a
 
 pkgname = hosts-gen
-
diff --git a/PKGBUILD b/PKGBUILD
index 5c9cc85e515c..e0dee4b836ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,39 @@
 # Maintainer: Andrew Hills <ahills@ednos.net>
 pkgname=hosts-gen
-pkgver=0.9
-# No actual releases provided; find the right commit and download a snapshot from cgit
-_pkgcommit=d3015d319d378390139455731b974569fbc2cd40
-pkgrel=2
+pkgver=0.9.20191123.2
+# No actual releases provided; use a specific commit
+_pkgcommit=562b4af551efc7249cb68f6d4b8909daf2ce7ce6
+pkgrel=1
 epoch=
 pkgdesc="A little framework to generate /etc/hosts from /etc/hosts.d"
 arch=('any')
-url="http://git.r-36.net/$pkgname/"
+url="http://r-36.net/scm/$pkgname/"
 license=('GPL3')
 groups=()
 depends=('coreutils')
 backup=()
 options=()
 install="$pkgname.install"
-source=("http://git.r-36.net/$pkgname/snapshot/$pkgname-$_pkgcommit.tar.bz2"
+source=("$pkgname::git://r-36.net/$pkgname#commit=$_pkgcommit"
 				"$pkgname.path"
 				"$pkgname.service")
-md5sums=('534edf642f15df0a073a716967724065'
+md5sums=('SKIP'
          '470be01a8490fc054fb0a04d3a74eed1'
          '12ed5fdea9f047bb03e61e8f846c641a')
 validpgpkeys=()
 
+pkgver() {
+	cd "$pkgname"
+	set +x
+	local version=$(sed -n -e 's/^VERSION = //p' config.mk)
+	# group commits by date, counting the ones on the date chosen for the version
+	local commitdate=$(git show -s --date=short --format=%cd)
+	local datecommits=$(git rev-list --since="$commitdate 00:00 UTC" HEAD | wc -l)
+	git show -s --date=format:%Y%m%d --format=format:$version.%cd.$datecommits
+}
+
 package() {
-	cd "$pkgname-$_pkgcommit"
+	cd "$pkgname"
 	make DESTDIR="$pkgdir/" install
 	# Generate this from /etc/hosts on install
 	rm "$pkgdir/etc/hosts.d/01-hosts.local"
@@ -32,8 +42,8 @@ package() {
 	mv "$pkgdir/bin" "$pkgdir/usr/bin"
 	# Install documentation
 	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
-	install -m0644 "$srcdir/$pkgname-$_pkgcommit/README" "$pkgdir/usr/share/doc/$pkgname/README"
-	install -m0644 "$srcdir/$pkgname-$_pkgcommit/LICENSE" "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+	install -m0644 "$srcdir/$pkgname/README" "$pkgdir/usr/share/doc/$pkgname/README"
+	install -m0644 "$srcdir/$pkgname/LICENSE" "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 	# Install systemd units
 	mkdir -p "$pkgdir/usr/lib/systemd/system"
 	install -m0644 "$srcdir/$pkgname.path" "$pkgdir/usr/lib/systemd/system/$pkgname.path"