summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2007-08-21 18:21:26 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2007-08-21 18:21:26 +0000
commit230dc7f1b2f355de41b1b261e51bbe6b8a63eeaf (patch)
tree4a3e205008109687878812338bcf732080ffa391
parentDocument rsync off-by-one stack overflow vulnerability. (diff)
Fix building with radiusclient.
PR: 115687
Notes
Notes: svn path=/head/; revision=198076
-rw-r--r--mail/exim/Makefile8
-rw-r--r--mail/exim/files/patch-src::auths::call_radius.c17
2 files changed, 21 insertions, 4 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index fc072b12d76c..e81ca455f287 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -407,10 +407,10 @@ SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-lradius,' \
-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1/etc/radius.conf,' \
-e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADLIB,'
.elif ${WITH_RADIUS_TYPE:L} == radiusclient
-LIB_DEPENDS+= radiusclient.0:${PORTSDIR}/net/radiusclient
-SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE}/lib -lradiusclient,' \
- -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE}/etc/radiusclient.conf,' \
- -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENT,'
+LIB_DEPENDS+= radiusclient-ng.2:${PORTSDIR}/net/radiusclient
+SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE}/lib -lradiusclient-ng,' \
+ -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE}/radiusclient-ng/radiusclient.conf,' \
+ -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENTNEW,'
.else
IGNORE= the variable WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT
.endif
diff --git a/mail/exim/files/patch-src::auths::call_radius.c b/mail/exim/files/patch-src::auths::call_radius.c
new file mode 100644
index 000000000000..59c14cc2b725
--- /dev/null
+++ b/mail/exim/files/patch-src::auths::call_radius.c
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- src/auths/call_radius.c
++++ src/auths/call_radius.c
+@@ -38,7 +38,11 @@
+ #if !defined(RADIUS_LIB_RADIUSCLIENT) && !defined(RADIUS_LIB_RADIUSCLIENTNEW)
+ #define RADIUS_LIB_RADIUSCLIENT
+ #endif
++ #if !defined(RADIUS_LIB_RADIUSCLIENTNEW)
+ #include <radiusclient.h>
++ #else
++ #include <radiusclient-ng.h>
++ #endif
+ #endif
+
+