Adopted. Removed build errors. Changed pkgver scheme -> epoch+=1.

2 files changed, 46 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0821b73477f3..cffc1a054c96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = authsae-git
 	pkgdesc = Authsae provides secure password-based authentication for 802.11s mesh networking.
-	pkgver = 20180729.3d4bd45
-	pkgrel = 3
+	pkgver = 1.2.9_4+r420.20190225.109a2e8
+	pkgrel = 1
+	epoch = 1
 	url = https://github.com/cozybit/authsae
 	arch = x86
 	arch = x86_64
@@ -12,7 +13,7 @@ pkgbase = authsae-git
 	depends = libconfig
 	provides = authsae
 	conflicts = authsae
-	source = git+https://github.com/cozybit/authsae.git
+	source = authsae::git+https://github.com/cozybit/authsae.git
 	md5sums = SKIP
 
 pkgname = authsae-git
diff --git a/PKGBUILD b/PKGBUILD
index 2533e6ca6a45..a3a60d568381 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,62 @@
-pkgname="authsae-git"
-pkgrel=3
-pkgver=20180729.3d4bd45
+# Maintainer: dreieck
+# Contributor: BrainDamage
+
+_pkgname="authsae"
+pkgname="${_pkgname}-git"
+pkgrel=1
+pkgver=1.2.9_4+r420.20190225.109a2e8
+epoch=1
 pkgdesc="Authsae provides secure password-based authentication for 802.11s mesh networking."
 arch=('x86' 'x86_64')
-url="https://github.com/cozybit/authsae"
+url="https://github.com/cozybit/${_pkgname}"
 license=("BSD")
 depends=("openssl" "libconfig")
 makedepends=("git" "cmake")
 provides=("authsae")
 conflicts=("authsae")
 md5sums=("SKIP")
-source=("git+https://github.com/cozybit/authsae.git")
+source=("${_pkgname}::git+https://github.com/cozybit/authsae.git")
 
 pkgver() {
-	cd "$srcdir/authsae"
-	#uuuugly code to use date + current git hash in lieu of absent release tag
-	echo "$(date +%Y%m%d).$(git describe --always)"
+  cd "${srcdir}/${_pkgname}"
+  
+  _ver="$(git describe --tags | sed 's|^v||' | sed 's|\-[^-]*$||' | tr '-' '_')"
+  _rev="$(git rev-list --count HEAD)"
+  _hash="$(git rev-parse --short HEAD)"
+  _date="$(git log -n 1 --format=tformat:%ci | awk '{print $1}' | tr -d '-')"
+  
+  if [ -n "${_ver}" ]; then
+    printf %s "${_ver}+r${_rev}.${_date}.${_hash}"
+  fi
 }
 
 prepare() {
-  cd "$srcdir/authsae"
-  msg "Removing '-Werror' from 'CMakeLists.txt'"
+  cd "${srcdir}/${_pkgname}"
+  msg2 "Removing '-Werror' from 'CMakeLists.txt'"
   sed -e 's|\-Werror||' -i CMakeLists.txt
 }
 
 build() {
-	cd "$srcdir/authsae"
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
-	#FIXME: the cmake script does something very wrong and attempts to install the config file in prefix+/etc, submit patch to upstream to allow to change that
-	sed -i 's/\/usr\/etc/\/etc/' cmake_install.cmake
-	make
+  cd "${srcdir}/${_pkgname}"
+
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DENABLE_LINUX_TARGETS=ON \
+    .
+
+  # FIXME: the cmake script does something very wrong and attempts to install the config file in prefix+/etc, submit patch to upstream to allow to change that
+  sed -i 's/\/usr\/etc/\/etc/' cmake_install.cmake
+
+  make
 }
 
 package() {
-	cd "$srcdir/authsae"
-	make DESTDIR=$pkgdir install
-	install -D README "$pkgdir/usr/share/authsae/README"
-}
\ No newline at end of file
+  cd "${srcdir}/${_pkgname}"
+  make DESTDIR="${pkgdir}" install
+  for _docfile in 'PORTING.md' 'README.md'; do
+    install -D -v -m644 "${_docfile}" "${pkgdir}/usr/share/doc/${_pkgname}/${_docfile}"
+  done
+  
+}