6 files changed, 41 insertions, 80 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 4bd1ac0c0df9..2740483a76b8 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	freeradius
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.1.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
+		ftp://ftp.ntua.gr/pub/net/radius/freeradius/ \
+		ftp://ftp.uk.freeradius.org/pub/radius/ \
+		ftp://ftp.freeradius.org/pub/radius/old/ \
 		http://freeradius.portal-to-web.de/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	david@wood2.org.uk
 COMMENT=	A free RADIUS server implementation
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
@@ -27,6 +29,7 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_OPENSSL=	yes
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CFLAGS+=	"-I${LOCALBASE}/include"
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
@@ -42,9 +45,9 @@ OPTIONS=	KERBEROS	"With Kerberos support" off \
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
 		--localstatedir=/var \
+		--with-system-libtool \
 		--disable-ltdl-install \
-		--with-ltdl-include=${LOCALBASE}/include \
-		--with-ltdl-lib=${LOCALBASE}/lib \
+		--with-docdir=${DOCSDIR} \
 		--with-large-files --without-rlm_sql_unixodbc \
 		--without-rlm_sql_oracle --without-rlm_sql_iodbc \
 		--without-rlm_sql_db2 \
@@ -148,8 +151,9 @@ MAN8=		radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 rlm_ippool_tool.8
 
 DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
 		dictionary.airespace dictionary.alcatel dictionary.alteon \
-		dictionary.altiga dictionary.aptis dictionary.aruba dictionary.ascend \
-		dictionary.avaya dictionary.bay dictionary.bintec dictionary.bristol \
+		dictionary.alvarion dictionary.altiga dictionary.aptis \
+		dictionary.aruba dictionary.ascend dictionary.avaya \
+		dictionary.bay dictionary.bintec dictionary.bristol \
 		dictionary.cablelabs dictionary.cabletron dictionary.cisco \
 		dictionary.cisco.bbsm dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \
 		dictionary.colubris dictionary.columbia_university dictionary.compat \
@@ -164,15 +168,16 @@ DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
 		dictionary.motorola dictionary.navini dictionary.netscreen \
 		dictionary.nokia dictionary.nomadix dictionary.nortel dictionary.ntua \
 		dictionary.packeteer dictionary.propel dictionary.quintum \
-		dictionary.redback dictionary.redcreek dictionary.rfc2865 \
-		dictionary.rfc2866 dictionary.rfc2867 dictionary.rfc2868 \
-		dictionary.rfc2869 dictionary.rfc3162 dictionary.rfc3576 \
-		dictionary.rfc3580 dictionary.roaringpenguin dictionary.shasta \
-		dictionary.shiva dictionary.sonicwall dictionary.springtide \
-		dictionary.starent dictionary.t_systems_nova dictionary.telebit \
-		dictionary.trapeze dictionary.unix dictionary.usr dictionary.valemount \
-		dictionary.versanet dictionary.waverider dictionary.wispr \
-		dictionary.xedia dictionary.xylan dictionary.zyxel
+		dictionary.redback dictionary.redcreek dictionary.riverstone \
+		dictionary.rfc2865 dictionary.rfc2866 dictionary.rfc2867 \
+		dictionary.rfc2868 dictionary.rfc2869 dictionary.rfc3162 \
+		dictionary.rfc3576 dictionary.rfc3580 dictionary.roaringpenguin \
+		dictionary.shasta dictionary.shiva dictionary.sonicwall \
+		dictionary.springtide dictionary.starent dictionary.t_systems_nova \
+		dictionary.telebit dictionary.trapeze dictionary.tropos \
+		dictionary.unix dictionary.usr dictionary.valemount \
+		dictionary.versanet dictionary.walabi dictionary.waverider \
+		dictionary.wispr dictionary.xedia dictionary.xylan dictionary.zyxel
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/Makefile.orig
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index 543c8392f1fa..9df573c78b73 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,3 +1,3 @@
-SHA256 (freeradius-1.1.2.tar.gz) = 5bc1b7fcb2d37fcce402e7baf9e8508b6fb62b94afead3b6da4718cd9a5762bf
-MD5 (freeradius-1.1.2.tar.gz) = 6649ac5f9666b4a8cd55a837068ca61e
-SIZE (freeradius-1.1.2.tar.gz) = 2389227
+MD5 (freeradius-1.1.3.tar.gz) = d8724cdc15bc23c330a7d3a2080829bd
+SHA256 (freeradius-1.1.3.tar.gz) = f615f67fb807494892015e671593801fe3ac30c04740cd1dc8d2f18fc218da35
+SIZE (freeradius-1.1.3.tar.gz) = 3068204
diff --git a/net/freeradius2/files/patch-4.11-fix b/net/freeradius2/files/patch-4.11-fix
deleted file mode 100644
index b58a4d5c91e4..000000000000
--- a/net/freeradius2/files/patch-4.11-fix
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/modules/rlm_otp/cardops/cryptocard.c.ORIG	Thu Dec  8 02:30:54 2005
-+++ src/modules/rlm_otp/cardops/cryptocard.c	Sat Feb  4 18:30:55 2006
-@@ -20,6 +20,10 @@
-  */
- 
- #include <inttypes.h>
-+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000)
-+#define PRIx32          "x"     /* uint32_t */
-+#define SCNx32          "x"     /* uint32_t */
-+#endif
- #include <string.h>
- #include <time.h>
- 
---- src/modules/rlm_otp/otp_state.c.ORIG	Sat Feb  4 18:22:14 2006
-+++ src/modules/rlm_otp/otp_state.c	Sat Feb  4 18:33:48 2006
-@@ -28,6 +28,10 @@
- 
- #include <errno.h>
- #include <inttypes.h>
-+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000)
-+#define PRIx32          "x"     /* uint32_t */
-+#define SCNx32          "x"     /* uint32_t */
-+#endif
- #include <stdio.h>
- #include <string.h>
- #include <sys/types.h>
---- src/modules/rlm_otp/otp_cardops.c.ORIG	Thu Dec  8 02:30:50 2005
-+++ src/modules/rlm_otp/otp_cardops.c	Sat Feb  4 18:37:22 2006
-@@ -30,6 +30,9 @@
- #endif
- #include <dlfcn.h>
- #include <inttypes.h>
-+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000)
-+#define     INT32_MAX       0x7fffffff
-+#endif
- #include <limits.h>
- #include <stdlib.h>
- #include <string.h>
---- src/modules/rlm_otp/Makefile.in.ORIG	Thu Dec  8 02:30:48 2005
-+++ src/modules/rlm_otp/Makefile.in	Sat Feb  4 18:44:06 2006
-@@ -34,7 +34,7 @@
- include ../rules.mak
- 
- # Not part of RLM_CFLAGS to avoid propagation to subdirs
--CFLAGS     += -Wno-unused-label -Wno-cast-qual
-+CFLAGS     += -Wno-cast-qual
- 
- $(STATIC_OBJS): $(HEADERS) $(CARDOPS_LTLIBS)
diff --git a/net/freeradius2/files/patch-doc::Makefile b/net/freeradius2/files/patch-doc::Makefile
index 251c70382085..233648f85883 100644
--- a/net/freeradius2/files/patch-doc::Makefile
+++ b/net/freeradius2/files/patch-doc::Makefile
@@ -1,18 +1,18 @@
---- doc/Makefile.orig	Mon Mar 27 15:12:40 2006
-+++ doc/Makefile	Mon Mar 27 15:13:06 2006
+--- doc/Makefile.orig	Sat Jul 15 18:16:51 2006
++++ doc/Makefile	Fri Oct 27 11:22:45 2006
 @@ -17,6 +17,7 @@
  	@rm -f *~
  
  install:
-+ifndef NOPORTDOCS
- 	$(INSTALL) -d -m 755 $(R)$(datadir)/doc
- 	$(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius
++#ifndef NOPORTDOCS 
+ 	$(INSTALL) -d -m 755 $(R)$(docdir)
  	for file in *[!~]; do \
-@@ -25,6 +26,7 @@
+ 		if [ -f $$file -a $$file != Makefile ]; then \
+@@ -24,6 +25,7 @@
  		fi; \
  	done
  	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
-+endif
++#endif
  
  common: $(SUBDIRS)
  
diff --git a/net/freeradius2/files/patch-src-main-Makefile.in b/net/freeradius2/files/patch-src-main-Makefile.in
index f29f4e45b9bf..8f576b2c1292 100644
--- a/net/freeradius2/files/patch-src-main-Makefile.in
+++ b/net/freeradius2/files/patch-src-main-Makefile.in
@@ -1,5 +1,5 @@
---- src/main/Makefile.in.orig	Mon Mar 27 15:22:33 2006
-+++ src/main/Makefile.in	Mon Mar 27 15:27:58 2006
+--- src/main/Makefile.in.orig	Mon Aug 21 13:47:46 2006
++++ src/main/Makefile.in	Fri Oct 27 12:18:50 2006
 @@ -19,6 +19,7 @@
  CFLAGS		+= -DHOSTINFO=\"${HOSTINFO}\"
  CFLAGS		+= -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
@@ -30,9 +30,9 @@
  radrelay.lo: radrelay.c $(INCLUDES)
  	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radrelay.c
  
- radrelay: radrelay.lo mainconfig.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo ../lib/libradius.la
--	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radrelay radrelay.lo mainconfig.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radrelay radrelay.lo mainconfig.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo $(LIBS)
+ radrelay: radrelay.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo ../lib/libradius.la
+-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radrelay radrelay.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo $(LIBS)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radrelay radrelay.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo $(LIBS)
  
  radwho.lo: radwho.c $(INCLUDES)
  	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radwho.c
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index 9ef836e79e19..b6eb295a1bc1 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -387,13 +387,13 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/rlm_fastusers
 %%PORTDOCS%%%%DOCSDIR%%/rlm_krb5
 %%PORTDOCS%%%%DOCSDIR%%/rlm_ldap
-%%PORTDOCS%%%%DOCSDIR%%/rlm_otp
 %%PORTDOCS%%%%DOCSDIR%%/rlm_pam
 %%PORTDOCS%%%%DOCSDIR%%/rlm_passwd
 %%PORTDOCS%%%%DOCSDIR%%/rlm_python
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sim_triplets
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sql
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter
+%%PORTDOCS%%%%DOCSDIR%%/rlm_sqlippool
 %%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt
 %%PORTDOCS%%%%DOCSDIR%%/tuning_guide
 %%PORTDOCS%%%%DOCSDIR%%/variables.txt
@@ -406,6 +406,7 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.alcatel
 %%DATADIR%%/dictionary.alteon
 %%DATADIR%%/dictionary.altiga
+%%DATADIR%%/dictionary.alvarion
 %%DATADIR%%/dictionary.aptis
 %%DATADIR%%/dictionary.aruba
 %%DATADIR%%/dictionary.ascend
@@ -468,6 +469,7 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.rfc3162
 %%DATADIR%%/dictionary.rfc3576
 %%DATADIR%%/dictionary.rfc3580
+%%DATADIR%%/dictionary.riverstone
 %%DATADIR%%/dictionary.roaringpenguin
 %%DATADIR%%/dictionary.shasta
 %%DATADIR%%/dictionary.shiva
@@ -477,10 +479,12 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.t_systems_nova
 %%DATADIR%%/dictionary.telebit
 %%DATADIR%%/dictionary.trapeze
+%%DATADIR%%/dictionary.tropos
 %%DATADIR%%/dictionary.unix
 %%DATADIR%%/dictionary.usr
 %%DATADIR%%/dictionary.valemount
 %%DATADIR%%/dictionary.versanet
+%%DATADIR%%/dictionary.walabi
 %%DATADIR%%/dictionary.waverider
 %%DATADIR%%/dictionary.wispr
 %%DATADIR%%/dictionary.xedia