main/freeradius: upgrade to 2.2.3

2 files changed, 30 insertions, 77 deletions

diff --git a/main/freeradius/0001-Fix-errors.patch b/main/freeradius/0001-Fix-errors.patch
deleted file mode 100644
index 8ea7ece761..0000000000
--- a/main/freeradius/0001-Fix-errors.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 e500d8ed70..1c9f02d378 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=freeradius
-pkgver=2.2.2
-pkgrel=2
+pkgver=2.2.3
+pkgrel=0
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 arch="all"
@@ -21,7 +21,6 @@ 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
@@ -100,87 +99,87 @@ package() {
 ldap() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/etc/raddb
-	mv $pkgdir/etc/raddb/ldap.attrmap $subpkgdir/etc/raddb
+	mv $pkgdir/etc/raddb/ldap.attrmap $subpkgdir/etc/raddb || exit 1
 	mkdir -p $subpkgdir/etc/raddb/modules
-	mv $pkgdir/etc/raddb/modules/ldap $subpkgdir/etc/raddb/modules
+	mv $pkgdir/etc/raddb/modules/ldap $subpkgdir/etc/raddb/modules || exit 1
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_ldap* $subpkgdir/usr/lib/freeradius
+	mv $pkgdir/usr/lib/freeradius/rlm_ldap* $subpkgdir/usr/lib/freeradius || exit 1
 }
 
 lib() {
 	replaces="freeradius"
 	depends=""
 	mkdir -p $subpkgdir/usr/lib/freeradius $subpkgdir/etc/raddb \
-	 $subpkgdir/usr/share
-	mv $pkgdir/usr/lib/freeradius/libfreeradius-radius-${pkgver}.so \
-	 $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/etc/raddb/dictionary $subpkgdir/etc/raddb/dictionary
-	mv $pkgdir/usr/share/freeradius $subpkgdir/usr/share/freeradius
+	 $subpkgdir/usr/share || exit 1
+	mv $pkgdir/usr/lib/freeradius/libfreeradius-*.so \
+	 $subpkgdir/usr/lib/freeradius || exit 1
+	mv $pkgdir/etc/raddb/dictionary $subpkgdir/etc/raddb/dictionary || exit 1
+	mv $pkgdir/usr/share/freeradius $subpkgdir/usr/share/freeradius || exit 1
 }
 
 mysql() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/etc/raddb/sql
-	mv $pkgdir/etc/raddb/sql/mysql $subpkgdir/etc/raddb/sql
-	mv $pkgdir/etc/raddb/sql/ndb $subpkgdir/etc/raddb/sql
+	mv $pkgdir/etc/raddb/sql/mysql $subpkgdir/etc/raddb/sql || exit 1
+	mv $pkgdir/etc/raddb/sql/ndb $subpkgdir/etc/raddb/sql || exit 1
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_sql_mysql* $subpkgdir/usr/lib/freeradius
+	mv $pkgdir/usr/lib/freeradius/rlm_sql_mysql* $subpkgdir/usr/lib/freeradius || exit 1
 }
 
 mssql() {
 	depends="freeradius"
 	arch="noarch"
 	mkdir -p $subpkgdir/etc/raddb/sql
-	mv $pkgdir/etc/raddb/sql/mssql $subpkgdir/etc/raddb/sql
+	mv $pkgdir/etc/raddb/sql/mssql $subpkgdir/etc/raddb/sql || exit 1
 }
 
 oracle() {
 	depends="freeradius"
 	arch="noarch"
 	mkdir -p $subpkgdir/etc/raddb/sql
-	mv $pkgdir/etc/raddb/sql/oracle $subpkgdir/etc/raddb/sql
+	mv $pkgdir/etc/raddb/sql/oracle $subpkgdir/etc/raddb/sql || exit 1
 }
 
 perl() {
 	depends="freeradius perl"
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_perl* $subpkgdir/usr/lib/freeradius
+	mv $pkgdir/usr/lib/freeradius/rlm_perl* $subpkgdir/usr/lib/freeradius || exit 1
 	mkdir -p $subpkgdir/usr/bin
-	mv $pkgdir/usr/sbin/checkrad $subpkgdir/usr/bin/checkrad
+	mv $pkgdir/usr/sbin/checkrad $subpkgdir/usr/bin/checkrad || exit 1
 	mkdir -p $subpkgdir/etc/raddb/modules
-	mv $pkgdir/etc/raddb/modules/perl $subpkgdir/etc/raddb/modules/perl
+	mv $pkgdir/etc/raddb/modules/perl $subpkgdir/etc/raddb/modules/perl || exit 1
 }
 
 postgresql() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/etc/raddb/sql
-	mv $pkgdir/etc/raddb/sql/postgresql $subpkgdir/etc/raddb/sql
+	mv $pkgdir/etc/raddb/sql/postgresql $subpkgdir/etc/raddb/sql || exit 1
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_sql_postgresql* $subpkgdir/usr/lib/freeradius
+	mv $pkgdir/usr/lib/freeradius/rlm_sql_postgresql* $subpkgdir/usr/lib/freeradius || exit 1
 }
 
 python() {
 	depends="freeradius python"
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_python* $subpkgdir/usr/lib/freeradius
+	mv $pkgdir/usr/lib/freeradius/rlm_python* $subpkgdir/usr/lib/freeradius || exit 1
 }
 
 radclient() {
 	depends=""
 	mkdir -p $subpkgdir/usr/bin
-	mv $pkgdir/usr/bin/radclient $subpkgdir/usr/bin/radclient
+	mv $pkgdir/usr/bin/radclient $subpkgdir/usr/bin/radclient || exit 1
 }
 
 unixodbc() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_sql_unixodbc* $subpkgdir/usr/lib/freeradius
+	mv $pkgdir/usr/lib/freeradius/rlm_sql_unixodbc* $subpkgdir/usr/lib/freeradius || exit 1
 }
 
 pam() {
 	depends="freeradius"
 	mkdir -p $subpkgdir/usr/lib/freeradius
-	mv $pkgdir/usr/lib/freeradius/rlm_pam* $subpkgdir/usr/lib/freeradius
+	mv $pkgdir/usr/lib/freeradius/rlm_pam* $subpkgdir/usr/lib/freeradius || exit 1
 }
 
 webif() {
@@ -210,15 +209,12 @@ webif() {
 	done
 }
 
-md5sums="863fa5eb2656621a73ec44f0bb18e8f6  freeradius-server-2.2.2.tar.gz
+md5sums="3186e75882c5aaed699da55be10511fe  freeradius-server-2.2.3.tar.gz
 fc6693f3df5a0694610110287a28568a  freeradius.confd
-5d83f40bd5c3a5d4e4a5f43c29e7f0da  freeradius.initd
-e4178d862dab58644a57c5a625c35c85  0001-Fix-errors.patch"
-sha256sums="96317c27ada5f8284fbabf018ed86baf8bddb463892d4627d6b3d03bbc1fa182  freeradius-server-2.2.2.tar.gz
+5d83f40bd5c3a5d4e4a5f43c29e7f0da  freeradius.initd"
+sha256sums="3be1e132f243ac53a7d35e0710bd116e8e126b64a1fc1198034195355072f593  freeradius-server-2.2.3.tar.gz
 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292  freeradius.confd
-78b1de6399f99c16f761700024bcf171557a64060ef4801b04b65886fb2d365d  freeradius.initd
-64d35574ff5419a09ffea930562e464658d2dd26a27adfa9af9f7fe5daf69b9a  0001-Fix-errors.patch"
-sha512sums="07d7909e29427f9dd04208c62ac8e7862024756a15282856ae073af5288aa82e16b57b9382d233a7e9c094f2a099a8103d8dcfbb7ef0c0fedd354fee7b7cd3c5  freeradius-server-2.2.2.tar.gz
+78b1de6399f99c16f761700024bcf171557a64060ef4801b04b65886fb2d365d  freeradius.initd"
+sha512sums="d51208d9926872292ef333bcf4e556a7fd06ac78def846c620422258c18ab77f98a22459a78bb92a35e684469d167a018ba2d47d894c32c7368a57e79fba9ede  freeradius-server-2.2.3.tar.gz
 e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b  freeradius.confd
-34c98c4ccded62aaa4a7539a9139288f7c39dbd8b6ca816c92cf6b0ae7546f81aa6c529dea943af5d8958cac2aad3d368a90f455ceaef725fce9fe5ef0cee84d  freeradius.initd
-aa033b4b401c825197d7b09f464135a30557baa2328a2dde2a1f7cd912d9a48fdbade4564ab1230d3c393c63d97afd9672d633846fbdac5c7887904f69bd04ec  0001-Fix-errors.patch"
+34c98c4ccded62aaa4a7539a9139288f7c39dbd8b6ca816c92cf6b0ae7546f81aa6c529dea943af5d8958cac2aad3d368a90f455ceaef725fce9fe5ef0cee84d  freeradius.initd"