diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2013-11-12 12:47:12 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2013-11-12 12:47:24 +0000 |
| commit | 1f203f63ec95a0792b03f5951adb71b072948b9b (patch) | |
| tree | ededbef722cd256fd3a622f394763206306062e4 | |
| parent | ae78755692aab7124baed1ea0bd196684a6d0e4c (diff) | |
| download | aports-1f203f63ec95a0792b03f5951adb71b072948b9b.tar.bz2 aports-1f203f63ec95a0792b03f5951adb71b072948b9b.tar.xz | |
main/freeradius: upgrade to 2.2.2
| -rw-r--r-- | main/freeradius/0001-Fix-errors.patch | 43 | ||||
| -rw-r--r-- | main/freeradius/APKBUILD | 26 |
2 files changed, 62 insertions, 7 deletions
diff --git a/main/freeradius/0001-Fix-errors.patch b/main/freeradius/0001-Fix-errors.patch new file mode 100644 index 000000000..8ea7ece76 --- /dev/null +++ b/main/freeradius/0001-Fix-errors.patch @@ -0,0 +1,43 @@ +From 9c9e995514ab3903fa9c120f34494e328087f260 Mon Sep 17 00:00:00 2001 +From: "Alan T. DeKok" <aland@freeradius.org> +Date: Wed, 30 Oct 2013 11:30:45 -0400 +Subject: [PATCH 1/7] Fix errors + +--- + src/main/dhcpd.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/main/dhcpd.c b/src/main/dhcpd.c +index ccd223e..57ff913 100644 +--- a/src/main/dhcpd.c ++++ b/src/main/dhcpd.c +@@ -117,7 +117,7 @@ static int dhcprelay_process_client_request(REQUEST *request) + /* set SRC ipaddr/port to the listener ipaddr/port */ + request->packet->src_ipaddr.af = AF_INET; + request->packet->src_ipaddr.ipaddr.ip4addr.s_addr = giaddrvp->vp_ipaddr; +- request->packet->src_port = sock->port; ++ request->packet->src_port = sock->lsock.port; + + vp = pairfind(request->config_items, DHCP2ATTR(270)); /* DHCP-Relay-To-IP-Address */ + rad_assert(vp != NULL); +@@ -165,7 +165,7 @@ static int dhcprelay_process_server_reply(REQUEST *request) + /* set SRC ipaddr/port to the listener ipaddr/port */ + request->packet->src_ipaddr.af = AF_INET; + request->packet->src_ipaddr.ipaddr.ip4addr.s_addr = giaddrvp->vp_ipaddr; +- request->packet->src_port = sock->port; ++ request->packet->src_port = sock->lsock.port; + + /* set DEST ipaddr/port to clientip/68 or broadcast in specific cases */ + request->packet->dst_ipaddr.af = AF_INET; +@@ -530,7 +530,7 @@ static int dhcp_process(REQUEST *request) + + static int dhcp_socket_parse(CONF_SECTION *cs, rad_listen_t *this) + { +- int rcode, broadcast = 1; ++ int rcode; + int on = 1; + dhcp_socket_t *sock; + RADCLIENT *client; +-- +1.8.1.2 + diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD index b6bb36f16..5a149a6c4 100644 --- a/main/freeradius/APKBUILD +++ b/main/freeradius/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=freeradius -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=0 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server" url="http://freeradius.org/" @@ -21,12 +21,21 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-ldap $pkgname-lib source="ftp://ftp.freeradius.org/pub/freeradius/$pkgname-server-$pkgver.tar.gz freeradius.confd freeradius.initd + 0001-Fix-errors.patch " _builddir="$srcdir"/$pkgname-server-$pkgver prepare() { cd "$_builddir" + for i in $source; do + case $i in + *.patch) + msg "Applying $i" + patch -p1 -i "$srcdir"/$i || return 1 + ;; + esac + done update_config_sub || return 1 # we dont have libnsl @@ -201,12 +210,15 @@ webif() { done } -md5sums="311abdb7a7e485c8b1393cf431daed8e freeradius-server-2.2.1.tar.gz +md5sums="863fa5eb2656621a73ec44f0bb18e8f6 freeradius-server-2.2.2.tar.gz fc6693f3df5a0694610110287a28568a freeradius.confd -5d83f40bd5c3a5d4e4a5f43c29e7f0da freeradius.initd" -sha256sums="bdc4b2135f60e481ba25e88816102837539004831be882f545fa7198fa7cc70c freeradius-server-2.2.1.tar.gz +5d83f40bd5c3a5d4e4a5f43c29e7f0da freeradius.initd +e4178d862dab58644a57c5a625c35c85 0001-Fix-errors.patch" +sha256sums="96317c27ada5f8284fbabf018ed86baf8bddb463892d4627d6b3d03bbc1fa182 freeradius-server-2.2.2.tar.gz 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 freeradius.confd -78b1de6399f99c16f761700024bcf171557a64060ef4801b04b65886fb2d365d freeradius.initd" -sha512sums="88d2f3dd99e7bd1c60f01aceaaefb1cfe04ff134cb705d74e55c0b08289a552096ca322a0bc1d8590348f7858d2b24610a4dc075b4248ac5aba1f75a6dd92d13 freeradius-server-2.2.1.tar.gz +78b1de6399f99c16f761700024bcf171557a64060ef4801b04b65886fb2d365d freeradius.initd +64d35574ff5419a09ffea930562e464658d2dd26a27adfa9af9f7fe5daf69b9a 0001-Fix-errors.patch" +sha512sums="07d7909e29427f9dd04208c62ac8e7862024756a15282856ae073af5288aa82e16b57b9382d233a7e9c094f2a099a8103d8dcfbb7ef0c0fedd354fee7b7cd3c5 freeradius-server-2.2.2.tar.gz e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b freeradius.confd -34c98c4ccded62aaa4a7539a9139288f7c39dbd8b6ca816c92cf6b0ae7546f81aa6c529dea943af5d8958cac2aad3d368a90f455ceaef725fce9fe5ef0cee84d freeradius.initd" +34c98c4ccded62aaa4a7539a9139288f7c39dbd8b6ca816c92cf6b0ae7546f81aa6c529dea943af5d8958cac2aad3d368a90f455ceaef725fce9fe5ef0cee84d freeradius.initd +aa033b4b401c825197d7b09f464135a30557baa2328a2dde2a1f7cd912d9a48fdbade4564ab1230d3c393c63d97afd9672d633846fbdac5c7887904f69bd04ec 0001-Fix-errors.patch" |