diff options
| author | Simon Frankenberger <simon@fraho.eu> | 2018-12-27 22:19:22 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-02-07 15:39:25 +0000 |
| commit | 50512b853376fffa9e9b711bd11aa866e2ba126b (patch) | |
| tree | da5774d2badf60ab1835c7e080592672b394caa4 | |
| parent | 90c64e1e7883c0ce7fb5058428a9cbf7b7c0772e (diff) | |
main/apache-mod-auth-radius: Update to 1.6.0
| -rw-r--r-- | main/apache-mod-auth-radius/APKBUILD | 41 | ||||
| -rw-r--r-- | main/apache-mod-auth-radius/remote-ip.patch | 20 |
2 files changed, 11 insertions, 50 deletions
diff --git a/main/apache-mod-auth-radius/APKBUILD b/main/apache-mod-auth-radius/APKBUILD index 280c9737eb9..a0e2a4c6cb9 100644 --- a/main/apache-mod-auth-radius/APKBUILD +++ b/main/apache-mod-auth-radius/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=apache-mod-auth-radius _pkgname=mod_auth_radius -pkgver=1.5.8 -pkgrel=3 +pkgver=1.6.0 +pkgrel=0 pkgdesc="Apache authentication module to become RADIUS client for AAA requests" url="http://freeradius.org/mod_auth_radius/" arch="all" @@ -11,41 +11,22 @@ license="BSD" depends="apache2" makedepends="apache2-dev freeradius-dev" install="" -source="ftp://ftp.freeradius.org/pub/radius/$_pkgname-$pkgver.tar - mod-auth-radius.conf - remote-ip.patch" - -_builddir="$srcdir"/$_pkgname-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -i "$srcdir"/$i || return 1;; - esac - done -} +options="!check" +source="$pkgname_$pkgver.tar.gz::https://github.com/FreeRADIUS/mod_auth_radius/archive/v$pkgver.tar.gz + mod-auth-radius.conf" +builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$_builddir" - apxs -c mod_auth_radius-2.0.c + apxs -c mod_auth_radius.c } package() { - cd "$_builddir" mkdir -p "$pkgdir"/etc/apache2/conf.d mkdir -p "$pkgdir"/usr/lib/apache2 - /usr/share/apache2/build/instdso.sh SH_LIBTOOL='/usr/share/build-1/libtool' mod_auth_radius-2.0.la "$pkgdir"/usr/lib/apache2/ - /usr/share/build-1/libtool --mode=install install mod_auth_radius-2.0.la "$pkgdir"/usr/lib/apache2/ + /usr/share/apache2/build/instdso.sh SH_LIBTOOL='/usr/share/build-1/libtool' mod_auth_radius.la "$pkgdir"/usr/lib/apache2/ + /usr/share/build-1/libtool --mode=install install mod_auth_radius.la "$pkgdir"/usr/lib/apache2/ install -D -m644 ../../mod-auth-radius.conf "$pkgdir"/etc/apache2/conf.d/mod-auth-radius.conf } -md5sums="87d8ef049736254cc09f8b34667f0e59 mod_auth_radius-1.5.8.tar -7021387d32ae7ccb3490ef06ef101b65 mod-auth-radius.conf -50775b28edbbf74fd1d99b85447740f9 remote-ip.patch" -sha256sums="6a16cb64c8e3da5ccef5db007d3ab3fa53274bdb37c5f6b1821a12de42aa6d93 mod_auth_radius-1.5.8.tar -de656ee2c41d1b05044728d314cae2fff1b1af225b71fc852bc2c244bf24754d mod-auth-radius.conf -af286dc55ea23c8f5996f72f90c403514000b87de1a76c71f769208dfcffd556 remote-ip.patch" -sha512sums="0fcc43a44ea17b33595a850abb03ff6b92e100dfbeffc82caa9516f6eb7914fb463cb62286d624203a2c7035d05a107dda7b68c5cedf7de3b8be95b9266b6988 mod_auth_radius-1.5.8.tar -f5f8bb154e290c4f1d1af899b24ee2011d8fe88fbf31a3fd865e9dfd9927cc8e23cb022be996ec3c43ed79309814ad63efe7f3cd5b3ed670d23a572b3e561f54 mod-auth-radius.conf -85f58a7d09ee097f61fe691a4cbd777c4208e1daa880d46980c944903a33e70e4ecfacbcccd1d8b6fd175c661b7b0cde7081470c024a89d84f274d2bf3963e24 remote-ip.patch" +sha512sums="e128855ab198b35030b798c16538fa33c1698f0f179fccb0d160c2d2cce08f1a7b2ecfaefdc19ae7f21802d38705b7a08414444ac52041b7365a5633e5e66159 1.6.0.tar.gz +f5f8bb154e290c4f1d1af899b24ee2011d8fe88fbf31a3fd865e9dfd9927cc8e23cb022be996ec3c43ed79309814ad63efe7f3cd5b3ed670d23a572b3e561f54 mod-auth-radius.conf" diff --git a/main/apache-mod-auth-radius/remote-ip.patch b/main/apache-mod-auth-radius/remote-ip.patch deleted file mode 100644 index a675bf01d96..00000000000 --- a/main/apache-mod-auth-radius/remote-ip.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mod_auth_radius-2.0.c -+++ mod_auth_radius-2.0.c.patched -@@ -680,7 +680,7 @@ - * benefit here. - */ - apr_snprintf(one, COOKIE_SIZE, "%s%s%s%s%s%08x", scr->secret, -- r->user, passwd, c->remote_ip, hostname, expires); -+ r->user, passwd, r->useragent_ip, hostname, expires); - - /* if you're REALLY worried about what's going on */ - -@@ -688,7 +688,7 @@ - ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," secret = %s\n", scr->secret); - ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," user = %s\n", r->user); - ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," passwd = %s\n", passwd); -- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," remote ip = %s\n", c->remote_ip); -+ ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," useragent ip = %s\n", r->useragent_ip); - ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," hostname = %s\n", hostname); - ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," expiry = %08x\n", expires); - #endif |