miredo 1.2.6+139+g6eb5e5a

2 files changed, 44 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97e0db5be9e1..149b94e44fc9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
 pkgbase = miredo
 	pkgdesc = Teredo client and server.
-	pkgver = 1.2.6
-	pkgrel = 4
-	url = http://www.remlab.net/miredo/
+	pkgver = 1.2.6+139+g6eb5e5a
+	pkgrel = 1
+	url = https://www.remlab.net/miredo/
 	arch = x86_64
 	license = GPL
+	makedepends = git
 	depends = judy
 	depends = iproute2
 	depends = libcap
 	backup = etc/miredo/miredo.conf
+	backup = etc/miredo/miredo-server.conf
 	backup = etc/miredo/client-hook
-	source = http://www.remlab.net/files/miredo/miredo-1.2.6.tar.xz
-	source = http://www.remlab.net/files/miredo/miredo-1.2.6.tar.xz.asc
-	source = miredo.service
-	validpgpkeys = 9480583353E334D2F03FE80CC3EC6DBEDD6D12BD
-	sha256sums = fa26d2f4a405415833669e2e2e22677b225d8f83600844645d5683535ea43149
-	sha256sums = SKIP
-	sha256sums = 6985563b19de2d8cea7d080a72acb8874cf358315042231c9ea64721c66c3279
+	source = git+http://git.remlab.net/git/miredo.git#commit=6eb5e5a417667d47dfca31f80d5f3debbc4c4e0e
+	sha512sums = SKIP
 
 pkgname = miredo
 
diff --git a/PKGBUILD b/PKGBUILD
index 25551df2a1d5..4707906d72b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,50 @@
-# $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: nl6720 <nl6720@gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=miredo
-pkgver=1.2.6
-pkgrel=4
-pkgdesc="Teredo client and server."
+pkgver=1.2.6+139+g6eb5e5a
+pkgrel=1
+_commit='6eb5e5a417667d47dfca31f80d5f3debbc4c4e0e'
+pkgdesc='Teredo client and server.'
 arch=('x86_64')
-url="http://www.remlab.net/miredo/"
+url='https://www.remlab.net/miredo/'
 license=('GPL')
 depends=('judy' 'iproute2' 'libcap')
+makedepends=('git')
 backup=('etc/miredo/miredo.conf'
+        'etc/miredo/miredo-server.conf'
         'etc/miredo/client-hook')
-validpgpkeys=('9480583353E334D2F03FE80CC3EC6DBEDD6D12BD')
-source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.asc}
-	miredo.service)
-sha256sums=('fa26d2f4a405415833669e2e2e22677b225d8f83600844645d5683535ea43149'
-            'SKIP'
-            '6985563b19de2d8cea7d080a72acb8874cf358315042231c9ea64721c66c3279')
+#validpgpkeys=('9480583353E334D2F03FE80CC3EC6DBEDD6D12BD')	# Rémi Denis-Courmont
+#source=("http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,'.asc'})
+source=("git+http://git.remlab.net/git/miredo.git#commit=${_commit}")
+sha512sums=('SKIP')
+
+pkgver() {
+	cd "${pkgname}"
+	git describe --tags | sed 's/-/+/g'
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--libexecdir=/usr/lib \
-	--sbindir=/usr/bin \
-	--with-Judy \
-	--disable-assert
-  make
+	cd "${srcdir}/${pkgname}"
+	./autogen.sh
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--libexecdir=/usr/lib \
+		--sbindir=/usr/bin \
+		--with-Judy \
+		--disable-assert \
+		--disable-static \
+		--enable-miredo-user
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  sed -i 's#/sbin/ip#/usr/bin/ip#' "$pkgdir"/etc/miredo/client-hook
-  rmdir "$pkgdir/var/run" "$pkgdir/var"
-  install -Dm644 "$srcdir/miredo.service" "$pkgdir/usr/lib/systemd/system/miredo.service"
+	cd "${srcdir}/${pkgname}"
+	make DESTDIR="${pkgdir}" install
+	sed -i 's#/sbin/ip#/usr/bin/ip#' "${pkgdir}/etc/miredo/client-hook"
+	rmdir "${pkgdir}/var/run" "${pkgdir}/var"
+	echo 'u miredo - "Teredo IPv6 tunneling daemon"' |
+		install -Dm644 /dev/stdin "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
 }