commit mod_auth_radius 1.6.0-1

2 files changed, 8 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e71a4353681c..12101a2846f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mod_auth_radius
 	pkgdesc = Radius authentication module for Apache
-	pkgver = 1.5.8
+	pkgver = 1.6.0
 	pkgrel = 1
 	url = http://freeradius.org/mod_auth_radius/
 	arch = x86_64
@@ -9,10 +9,8 @@ pkgbase = mod_auth_radius
 	depends = apache
 	conflicts = apache-mod_auth_radius
 	replaces = apache-mod_auth_radius
-	source = ftp://ftp.freeradius.org/pub/radius/mod_auth_radius-1.5.8.tar
-	source = http://ftp.de.debian.org/debian/pool/main/liba/libapache-mod-auth-radius/libapache-mod-auth-radius_1.5.8-1.2.diff.gz
-	sha256sums = 6a16cb64c8e3da5ccef5db007d3ab3fa53274bdb37c5f6b1821a12de42aa6d93
-	sha256sums = e8de2c1a76178dd993d0011966e29c29d1a0ae5db929f6bd643c6fe4d43b6140
+	source = mod_auth_radius-1.6.0.tar.gz::https://github.com/FreeRADIUS/mod_auth_radius/archive/v1.6.0.tar.gz
+	sha256sums = 018a2f9887fb838a256fcc76c37ca996928392e2aaee0a0ef936b6381de60a51
 
 pkgname = mod_auth_radius
 
diff --git a/PKGBUILD b/PKGBUILD
index b2e139693c69..cf72a2324e3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Christian Hesse <mail@eworm.de>
 
 pkgname=mod_auth_radius
-pkgver=1.5.8
+pkgver=1.6.0
 pkgrel=1
 pkgdesc='Radius authentication module for Apache'
 arch=('x86_64' 'i686')
@@ -10,28 +10,20 @@ license=('GPL')
 depends=('apache')
 conflicts=('apache-mod_auth_radius')
 replaces=('apache-mod_auth_radius')
-source=('ftp://ftp.freeradius.org/pub/radius/mod_auth_radius-1.5.8.tar'
-	'http://ftp.de.debian.org/debian/pool/main/liba/libapache-mod-auth-radius/libapache-mod-auth-radius_1.5.8-1.2.diff.gz')
-sha256sums=('6a16cb64c8e3da5ccef5db007d3ab3fa53274bdb37c5f6b1821a12de42aa6d93'
-            'e8de2c1a76178dd993d0011966e29c29d1a0ae5db929f6bd643c6fe4d43b6140')
-
-prepare() {
-	cd "${srcdir}/mod_auth_radius-${pkgver}/"
-
-	patch -Np1 < "${srcdir}/libapache-mod-auth-radius_1.5.8-1.2.diff"
-}
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/FreeRADIUS/mod_auth_radius/archive/v${pkgver}.tar.gz")
+sha256sums=('018a2f9887fb838a256fcc76c37ca996928392e2aaee0a0ef936b6381de60a51')
 
 build() {
 	cd "${srcdir}/mod_auth_radius-${pkgver}/"
 
-	apxs -c mod_auth_radius-2.0.c
+	apxs -a -c mod_auth_radius.c
 }
 
 package() {
 	cd "${srcdir}/mod_auth_radius-${pkgver}/"
 
 	# module
-	install -D -m0755 .libs/mod_auth_radius-2.0.so "${pkgdir}"/usr/lib/httpd/modules/mod_auth_radius.so
+	install -D -m0755 .libs/mod_auth_radius.so "${pkgdir}"/usr/lib/httpd/modules/mod_auth_radius.so
 
 	# config
 
@@ -39,6 +31,5 @@ package() {
 	install -D -m0644 htaccess "${pkgdir}"/usr/share/doc/${pkgname}/htaccess
 	install -D -m0644 httpd.conf "${pkgdir}"/usr/share/doc/${pkgname}/httpd.conf
 	install -D -m0644 index.html "${pkgdir}"/usr/share/doc/${pkgname}/index.html
-	install -D -m0644 README "${pkgdir}"/usr/share/doc/${pkgname}/README
 }