- Update to 3.0.3

4 files changed, 28 insertions, 8 deletions

diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index efed7764256a..3489eae2393b 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeradius
-DISTVERSION=	3.0.2
-PORTREVISION=	5
+DISTVERSION=	3.0.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -331,7 +330,8 @@ CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
 		--without-rlm_yubikey \
 		--without-rlm_sql_oracle \
 		--without-rlm_securid \
-		--with-vmps
+		--with-vmps \
+		--with-collectdclient-lib-dir=/dev/null
 
 .if ${ARCH} == amd64
 CONFIGURE_ARGS+=--with-pic
@@ -348,7 +348,7 @@ SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
 post-patch:
 # never try to find execinfo.h (needed until we can enable/disable backtrace
-	@${REINPLACE_CMD} -e '/execinfo.h/d' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/#include <execinfo.h>/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -Ee "s:tests/all.mk ::" ${WRKSRC}/src/all.mk
 	@${CP} ${WRKSRC}/m4/ax_with_prog.m4 ${WRKSRC}
 # Patch raddb/certs/Makefile for the full path to the openssl binary (using
@@ -374,4 +374,8 @@ pre-configure:
 	@${FIND} -E ${WRKSRC} -regex '.*/configure(\.in)?$$' -exec \
 		${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" {} \;
 
+post-build:
+	@${FIND} ${WRKSRC}/build/lib -type f -name '*.so' -exec ${STRIP_CMD} {} \;
+	@${FIND} ${WRKSRC}/build/bin -type f -exec ${STRIP_CMD} {} \;
+
 .include <bsd.port.post.mk>
diff --git a/net/freeradius3/distinfo b/net/freeradius3/distinfo
index 7192053fc2fd..7b1530f2e899 100644
--- a/net/freeradius3/distinfo
+++ b/net/freeradius3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeradius-server-3.0.2.tar.bz2) = 20dc8d1ca9de9ed70ff63369aeec9100ca0ed9630d9d42f707bc3293cd259329
-SIZE (freeradius-server-3.0.2.tar.bz2) = 2657652
+SHA256 (freeradius-server-3.0.3.tar.bz2) = 781488e18f7b80e241bb5dafa07fcf8f2f7fbe897b337a07367e3f73749ae729
+SIZE (freeradius-server-3.0.3.tar.bz2) = 2762771
diff --git a/net/freeradius3/files/patch-install-sh b/net/freeradius3/files/patch-install-sh
new file mode 100644
index 000000000000..e0742d564d16
--- /dev/null
+++ b/net/freeradius3/files/patch-install-sh
@@ -0,0 +1,11 @@
+--- ./install-sh.orig	2014-05-13 12:44:10.000000000 -0400
++++ ./install-sh	2014-05-13 12:44:43.000000000 -0400
+@@ -120,7 +120,7 @@
+ 		instcmd=:
+ 		chmodcmd=""
+ 	else
+-		instcmd=mkdir
++		instcmd="mkdir -p"
+ 	fi
+ else
+ 
diff --git a/net/freeradius3/pkg-plist b/net/freeradius3/pkg-plist
index 6d6c61ddc91f..09a867de7b73 100644
--- a/net/freeradius3/pkg-plist
+++ b/net/freeradius3/pkg-plist
@@ -5,8 +5,8 @@ bin/dhcpclient
 bin/rad_counter
 bin/radattr
 bin/radclient
-bin/radconf2xml
 bin/radcrypt
+bin/radeapclient
 bin/radlast
 bin/radsniff
 bin/radsqlrelay
@@ -16,6 +16,7 @@ bin/radzap
 bin/rlm_ippool_tool
 bin/smbencrypt
 include/freeradius/base64.h
+include/freeradius/build.h
 include/freeradius/conf.h
 include/freeradius/conffile.h
 include/freeradius/detail.h
@@ -278,7 +279,6 @@ man/man5/rlm_sql.5.gz
 man/man5/rlm_unix.5.gz
 man/man5/unlang.5.gz
 man/man5/users.5.gz
-man/man8/radconf2xml.8.gz
 man/man8/radcrypt.8.gz
 man/man8/raddebug.8.gz
 man/man8/radiusd.8.gz
@@ -509,6 +509,7 @@ sbin/radmin
 %%EXAMPLESDIR%%/raddb/mods-available/sqlcounter
 %%EXAMPLESDIR%%/raddb/mods-available/sqlippool
 %%EXAMPLESDIR%%/raddb/mods-available/sradutmp
+%%EXAMPLESDIR%%/raddb/mods-available/unbound
 %%EXAMPLESDIR%%/raddb/mods-available/unix
 %%EXAMPLESDIR%%/raddb/mods-available/unpack
 %%EXAMPLESDIR%%/raddb/mods-available/utf8
@@ -579,6 +580,7 @@ sbin/radmin
 %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql/setup.sql
 %%EXAMPLESDIR%%/raddb/mods-config/sql/main/sqlite/queries.conf
 %%EXAMPLESDIR%%/raddb/mods-config/sql/main/sqlite/schema.sql
+%%EXAMPLESDIR%%/raddb/mods-config/unbound/default.conf
 %%EXAMPLESDIR%%/raddb/mods-enabled/always
 %%EXAMPLESDIR%%/raddb/mods-enabled/attr_filter
 %%EXAMPLESDIR%%/raddb/mods-enabled/cache_eap
@@ -677,6 +679,7 @@ sbin/radmin
 %%DATADIR%%/dictionary.bluecoat
 %%DATADIR%%/dictionary.bristol
 %%DATADIR%%/dictionary.broadsoft
+%%DATADIR%%/dictionary.brocade
 %%DATADIR%%/dictionary.bskyb
 %%DATADIR%%/dictionary.bt
 %%DATADIR%%/dictionary.cablelabs
@@ -827,6 +830,7 @@ sbin/radmin
 %%DATADIR%%/dictionary.xylan
 %%DATADIR%%/dictionary.yubico
 %%DATADIR%%/dictionary.zeus
+%%DATADIR%%/dictionary.zte
 %%DATADIR%%/dictionary.zyxel
 @unexec rmdir "/var/run/radiusd" >/dev/null 2>&1 || :
 @unexec rmdir "/var/log/radacct" >/dev/null 2>&1 || :
@@ -835,6 +839,7 @@ sbin/radmin
 @dirrm %%EXAMPLESDIR%%/raddb/sites-available
 @dirrm %%EXAMPLESDIR%%/raddb/policy.d
 @dirrm %%EXAMPLESDIR%%/raddb/mods-enabled
+@dirrm %%EXAMPLESDIR%%/raddb/mods-config/unbound
 @dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/sqlite
 @dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql/extras
 @dirrm %%EXAMPLESDIR%%/raddb/mods-config/sql/main/postgresql