commit darkhttpd-git 1.14.r6.g11d36de-1

2 files changed, 19 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c680fe0319c3..426e22cbeed6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = darkhttpd-git
 	pkgdesc = A small, static webserver - git checkout
-	pkgver = 0.r283.g32158f9
+	pkgver = 1.14.r6.g11d36de
 	pkgrel = 1
-	url = http://dmr.ath.cx/net/darkhttpd/
+	url = https://unix4lyfe.org/darkhttpd/
 	arch = i686
 	arch = x86_64
 	license = BSD
@@ -10,14 +10,11 @@ pkgbase = darkhttpd-git
 	depends = glibc
 	provides = darkhttpd
 	conflicts = darkhttpd
-	source = git+http://unix4lyfe.org/git/darkhttpd
+	source = git+https://github.com/emikulic/darkhttpd
 	source = darkhttpd.service
 	source = darkhttpd.socket
-	source = http://www.eworm.de/download/linux/darkhttpd-get-version-string-from-git.patch
 	sha256sums = SKIP
 	sha256sums = c0c8885682aca80474986080b5426f73dbf37237d02e3fc9035ac72ba74cdb1b
 	sha256sums = 3a5ad507b72c0c37e3255a70a5dcd8c8c79b728efd07a2dc2f6786f9b9cc3c1b
-	sha256sums = b5be5a3a4bbd27aa2f197167e01e89866f196057ab077c209658f41d036b9815
 
 pkgname = darkhttpd-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 9dc4d4a3dc9a..62723095f800 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,36 +3,41 @@
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=darkhttpd-git
-pkgver=0.r283.g32158f9
+pkgver=1.14.r6.g11d36de
 pkgrel=1
-pkgdesc="A small, static webserver - git checkout"
+pkgdesc='A small, static webserver - git checkout'
 arch=('i686' 'x86_64')
-url="http://dmr.ath.cx/net/darkhttpd/"
+url='https://unix4lyfe.org/darkhttpd/'
 license=('BSD')
 depends=('glibc')
 makedepends=('git')
 conflicts=('darkhttpd')
 provides=('darkhttpd')
-source=('git+http://unix4lyfe.org/git/darkhttpd'
+source=('git+https://github.com/emikulic/darkhttpd'
 	'darkhttpd.service'
-	'darkhttpd.socket'
-	'http://www.eworm.de/download/linux/darkhttpd-get-version-string-from-git.patch')
+	'darkhttpd.socket')
+sha256sums=('SKIP'
+            'c0c8885682aca80474986080b5426f73dbf37237d02e3fc9035ac72ba74cdb1b'
+            '3a5ad507b72c0c37e3255a70a5dcd8c8c79b728efd07a2dc2f6786f9b9cc3c1b')
 
 pkgver() {
 	cd darkhttpd/
 
 	if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then
-		echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")"
+		printf '%s.r%s.g%s' \
+			"$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG})" \
+			"$(git rev-list --count ${GITTAG}..)" \
+			"$(git rev-parse --short HEAD)"
 	else
-		echo "0.r$(git rev-list --count master).g$(git log -1 --format="%h")"
+		printf '0.r%s.g%s' \
+			"$(git rev-list --count master)" \
+			"$(git rev-parse --short HEAD)"
 	fi
 }
 
 build() {
 	cd darkhttpd/
 
-	patch -Np1 < ${srcdir}/darkhttpd-get-version-string-from-git.patch
-
 	make
 }
 
@@ -44,13 +49,9 @@ package() {
 	mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
 	sed -n '1,/ \*\//p' < darkhttpd.c > ${pkgdir}/usr/share/licenses/${pkgname}/license
 
-	install -D -m0644 README ${pkgdir}/usr/share/doc/${pkgname}/README
+	install -D -m0644 README.md ${pkgdir}/usr/share/doc/${pkgname}/README
 
 	install -D -m0644 ${srcdir}/darkhttpd.service ${pkgdir}/usr/lib/systemd/system/darkhttpd.service
 	install -D -m0644 ${srcdir}/darkhttpd.socket ${pkgdir}/usr/lib/systemd/system/darkhttpd.socket
 }
 
-sha256sums=('SKIP'
-            'c0c8885682aca80474986080b5426f73dbf37237d02e3fc9035ac72ba74cdb1b'
-            '3a5ad507b72c0c37e3255a70a5dcd8c8c79b728efd07a2dc2f6786f9b9cc3c1b'
-            'b5be5a3a4bbd27aa2f197167e01e89866f196057ab077c209658f41d036b9815')