View | Details | Raw Unified | Return to bug 133532
Collapse All | Expand All

(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (freeradius-server-2.1.3.tar.bz2) = df7a23ec6303a89d014fcc43418ce5e5
1
MD5 (freeradius-server-2.1.4.tar.bz2) = ba1fd573222ed5c8bead1cce1383a7a9
2
SHA256 (freeradius-server-2.1.3.tar.bz2) = 984cf7f3418de8f2abe1e599827264495cef1d234cce4abe05a06a4b6419db1a
2
SHA256 (freeradius-server-2.1.4.tar.bz2) = d509191a2a0cd556f23639547d176c662c0fc0de09fc625e1afc62ed84cbd2de
3
SIZE (freeradius-server-2.1.3.tar.bz2) = 2380451
3
SIZE (freeradius-server-2.1.4.tar.bz2) = 2405962
(-)files/patch-version (+5 lines)
Line 0 Link Here
1
--- VERSION	2009-03-19 13:59:05.000000000 +0000
2
+++ VERSION	2009-03-19 13:59:14.000000000 +0000
3
@@ -1 +1 @@
4
-2.1.5
5
+2.1.4
(-)files/patch-bootstrap (+11 lines)
Line 0 Link Here
1
--- raddb/certs/bootstrap	2009-03-18 20:20:41.000000000 +0000
2
+++ raddb/certs/bootstrap	2009-03-18 21:20:25.000000000 +0000
3
@@ -17,7 +17,7 @@
4
 #
5
 #  If that worked, exit.  Otherwise, run the commands manually.
6
 #
7
-if [ "$?" == "0" ]
8
+if [ $? -eq 0 ]
9
 then
10
   exit 0
11
 fi
(-)files/pkg-install.in (+14 lines)
Lines 15-20 Link Here
15
radius_raddb_work="%%RADDB_WORK%%"
15
radius_raddb_work="%%RADDB_WORK%%"
16
radius_raddb="%%RADDB%%"
16
radius_raddb="%%RADDB%%"
17
radius_logdir="%%LOGDIR%%"
17
radius_logdir="%%LOGDIR%%"
18
radius_libdir="%%LIBDIR%%"
18
19
19
radius_run_as_user="%%RUN_AS_USER%%"
20
radius_run_as_user="%%RUN_AS_USER%%"
20
21
Lines 145-150 Link Here
145
	    fi
146
	    fi
146
	done
147
	done
147
148
149
	# Update the libdir line in radiusd.conf
150
	echo "===> Updating libdir in ${radius_raddb}/radiusd.conf"
151
	if ! sed -i.update-libdir-original -Ee $( \
152
	        echo -n 's:^(libdir[[:space:]=]+)(.*[[:space:]:]+)?' ; \
153
	        echo -n $( echo ${radius_libdir} | \
154
	            sed -Ee 's:^(.*)-[[:digit:].]+$:\1:' ) ; \
155
	        echo -n '(-[[:digit:].]+)?([[:space:]:]+.*)?$' ; \ 
156
		echo -n ':\1\2'${radius_libdir}'\4:' \
157
	    ) ${radius_raddb}/radiusd.conf; then
158
	    echo "Failed to update libdir in ${radius_raddb}/radius.conf"
159
	    exit 1
160
	fi
161
	rm ${radius_raddb}/radiusd.conf.update-libdir-original
148
        ;;
162
        ;;
149
esac
163
esac
150
164
(-)pkg-plist (-1 / +11 lines)
Lines 60-65 Link Here
60
%%EXAMPLESDIR%%/raddb/modules/mac2ip
60
%%EXAMPLESDIR%%/raddb/modules/mac2ip
61
%%EXAMPLESDIR%%/raddb/modules/mac2vlan
61
%%EXAMPLESDIR%%/raddb/modules/mac2vlan
62
%%EXAMPLESDIR%%/raddb/modules/mschap
62
%%EXAMPLESDIR%%/raddb/modules/mschap
63
%%EXAMPLESDIR%%/raddb/modules/otp
63
%%EXAMPLESDIR%%/raddb/modules/pam
64
%%EXAMPLESDIR%%/raddb/modules/pam
64
%%EXAMPLESDIR%%/raddb/modules/pap
65
%%EXAMPLESDIR%%/raddb/modules/pap
65
%%EXAMPLESDIR%%/raddb/modules/passwd
66
%%EXAMPLESDIR%%/raddb/modules/passwd
Lines 69-80 Link Here
69
%%EXAMPLESDIR%%/raddb/modules/radutmp
70
%%EXAMPLESDIR%%/raddb/modules/radutmp
70
%%EXAMPLESDIR%%/raddb/modules/realm
71
%%EXAMPLESDIR%%/raddb/modules/realm
71
%%EXAMPLESDIR%%/raddb/modules/smbpasswd
72
%%EXAMPLESDIR%%/raddb/modules/smbpasswd
73
%%EXAMPLESDIR%%/raddb/modules/smsotp
72
%%EXAMPLESDIR%%/raddb/modules/sql_log
74
%%EXAMPLESDIR%%/raddb/modules/sql_log
73
%%EXAMPLESDIR%%/raddb/modules/sqlcounter_expire_on_login
75
%%EXAMPLESDIR%%/raddb/modules/sqlcounter_expire_on_login
74
%%EXAMPLESDIR%%/raddb/modules/sradutmp
76
%%EXAMPLESDIR%%/raddb/modules/sradutmp
75
%%EXAMPLESDIR%%/raddb/modules/unix
77
%%EXAMPLESDIR%%/raddb/modules/unix
76
%%EXAMPLESDIR%%/raddb/modules/wimax
78
%%EXAMPLESDIR%%/raddb/modules/wimax
77
%%EXAMPLESDIR%%/raddb/otp.conf
78
%%EXAMPLESDIR%%/raddb/policy.conf
79
%%EXAMPLESDIR%%/raddb/policy.conf
79
%%EXAMPLESDIR%%/raddb/policy.txt
80
%%EXAMPLESDIR%%/raddb/policy.txt
80
%%EXAMPLESDIR%%/raddb/preproxy_users
81
%%EXAMPLESDIR%%/raddb/preproxy_users
Lines 90-100 Link Here
90
%%EXAMPLESDIR%%/raddb/sites-available/dynamic-clients
91
%%EXAMPLESDIR%%/raddb/sites-available/dynamic-clients
91
%%EXAMPLESDIR%%/raddb/sites-available/example
92
%%EXAMPLESDIR%%/raddb/sites-available/example
92
%%EXAMPLESDIR%%/raddb/sites-available/inner-tunnel
93
%%EXAMPLESDIR%%/raddb/sites-available/inner-tunnel
94
%%EXAMPLESDIR%%/raddb/sites-available/originate-coa
93
%%EXAMPLESDIR%%/raddb/sites-available/proxy-inner-tunnel
95
%%EXAMPLESDIR%%/raddb/sites-available/proxy-inner-tunnel
94
%%EXAMPLESDIR%%/raddb/sites-available/robust-proxy-accounting
96
%%EXAMPLESDIR%%/raddb/sites-available/robust-proxy-accounting
95
%%EXAMPLESDIR%%/raddb/sites-available/status
97
%%EXAMPLESDIR%%/raddb/sites-available/status
96
%%EXAMPLESDIR%%/raddb/sites-available/virtual.example.com
98
%%EXAMPLESDIR%%/raddb/sites-available/virtual.example.com
97
%%EXAMPLESDIR%%/raddb/sites-available/vmps
99
%%EXAMPLESDIR%%/raddb/sites-available/vmps
100
%%EXAMPLESDIR%%/raddb/sites-enabled/control-socket
98
%%EXAMPLESDIR%%/raddb/sites-enabled/default
101
%%EXAMPLESDIR%%/raddb/sites-enabled/default
99
%%EXAMPLESDIR%%/raddb/sites-enabled/inner-tunnel
102
%%EXAMPLESDIR%%/raddb/sites-enabled/inner-tunnel
100
%%EXAMPLESDIR%%/raddb/sql.conf
103
%%EXAMPLESDIR%%/raddb/sql.conf
Lines 396-401 Link Here
396
%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.a
399
%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.a
397
%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.la
400
%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.la
398
%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.so
401
%%EXPM%%%%SMB%%%%LIBDIR%%/rlm_smb.so
402
%%EXPM%%%%LIBDIR%%/rlm_smsotp-%%PORTVERSION%%.la
403
%%EXPM%%%%LIBDIR%%/rlm_smsotp-%%PORTVERSION%%.so
404
%%EXPM%%%%LIBDIR%%/rlm_smsotp.a
405
%%EXPM%%%%LIBDIR%%/rlm_smsotp.la
406
%%EXPM%%%%LIBDIR%%/rlm_smsotp.so
399
%%LIBDIR%%/rlm_sql-%%PORTVERSION%%.la
407
%%LIBDIR%%/rlm_sql-%%PORTVERSION%%.la
400
%%LIBDIR%%/rlm_sql-%%PORTVERSION%%.so
408
%%LIBDIR%%/rlm_sql-%%PORTVERSION%%.so
401
%%LIBDIR%%/rlm_sql.a
409
%%LIBDIR%%/rlm_sql.a
Lines 448-453 Link Here
448
%%EXPM%%%%LIBDIR%%/rlm_wimax.so
456
%%EXPM%%%%LIBDIR%%/rlm_wimax.so
449
@dirrm %%LIBDIR%%
457
@dirrm %%LIBDIR%%
450
sbin/checkrad
458
sbin/checkrad
459
sbin/raddebug
451
sbin/radiusd
460
sbin/radiusd
452
sbin/radmin
461
sbin/radmin
453
sbin/radwatch
462
sbin/radwatch
Lines 614-619 Link Here
614
%%DATADIR%%/dictionary.foundry
623
%%DATADIR%%/dictionary.foundry
615
%%DATADIR%%/dictionary.freeradius
624
%%DATADIR%%/dictionary.freeradius
616
%%DATADIR%%/dictionary.freeradius.internal
625
%%DATADIR%%/dictionary.freeradius.internal
626
%%DATADIR%%/dictionary.freeswitch
617
%%DATADIR%%/dictionary.gandalf
627
%%DATADIR%%/dictionary.gandalf
618
%%DATADIR%%/dictionary.garderos
628
%%DATADIR%%/dictionary.garderos
619
%%DATADIR%%/dictionary.gemtek
629
%%DATADIR%%/dictionary.gemtek
(-)Makefile (-5 / +20 lines)
Lines 4-12 Link Here
4
#
4
#
5
# $FreeBSD: ports/net/freeradius2/Makefile,v 1.75 2009/03/17 05:20:28 linimon Exp $
5
# $FreeBSD: ports/net/freeradius2/Makefile,v 1.75 2009/03/17 05:20:28 linimon Exp $
6
#
6
#
7
# $Id$
8
#
7
9
8
PORTNAME=	freeradius
10
PORTNAME=	freeradius
9
DISTVERSION=	2.1.3
11
DISTVERSION=	2.1.4
10
CATEGORIES=	net
12
CATEGORIES=	net
11
MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
13
MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
12
		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
14
		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
Lines 37-42 Link Here
37
USE_PYTHON=	yes
39
USE_PYTHON=	yes
38
MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
40
MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
39
CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
41
CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
42
MAKE_JOBS_UNSAFE=	yes
40
43
41
PLIST_SUB=	PORTVERSION=${DISTVERSION}
44
PLIST_SUB=	PORTVERSION=${DISTVERSION}
42
45
Lines 133-138 Link Here
133
		RADDB_WORK="${WRKSRC}/raddb" \
136
		RADDB_WORK="${WRKSRC}/raddb" \
134
		RADDB="${PREFIX}/etc/raddb" \
137
		RADDB="${PREFIX}/etc/raddb" \
135
		LOGDIR="${LOGDIR}" \
138
		LOGDIR="${LOGDIR}" \
139
		LIBDIR="${PREFIX}/${FREERADIUS_LIBDIR}" \
136
		RC_SUBR_SUFFIX="${RC_SUBR_SUFFIX}"
140
		RC_SUBR_SUFFIX="${RC_SUBR_SUFFIX}"
137
SUB_FILES+=	pkg-install pkg-deinstall pkg-message
141
SUB_FILES+=	pkg-install pkg-deinstall pkg-message
138
.ifdef(WITH_USER)
142
.ifdef(WITH_USER)
Lines 260-267 Link Here
260
		rlm_detail.5 rlm_digest.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 \
264
		rlm_detail.5 rlm_digest.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 \
261
		rlm_pap.5 rlm_passwd.5 rlm_policy.5 rlm_realm.5 rlm_sql.5 \
265
		rlm_pap.5 rlm_passwd.5 rlm_policy.5 rlm_realm.5 rlm_sql.5 \
262
		rlm_sql_log.5 rlm_unix.5 unlang.5 users.5
266
		rlm_sql_log.5 rlm_unix.5 unlang.5 users.5
263
MAN8=		radiusd.8 radmin.8 radrelay.8 radsqlrelay.8 radwatch.8 \
267
MAN8=		radiusd.8 radmin.8 raddebug.8 radrelay.8 radsqlrelay.8 \
264
		rlm_ippool_tool.8
268
		radwatch.8 rlm_ippool_tool.8
265
269
266
SUB_LIST+=	REQUIRE="${_REQUIRE}"
270
SUB_LIST+=	REQUIRE="${_REQUIRE}"
267
271
Lines 275-287 Link Here
275
# Patch raddb/certs/bootstrap to use gmake instead of make
279
# Patch raddb/certs/bootstrap to use gmake instead of make
276
	@${REINPLACE_CMD} -Ee "s:^make:${GMAKE}:" \
280
	@${REINPLACE_CMD} -Ee "s:^make:${GMAKE}:" \
277
		${WRKSRC}/raddb/certs/bootstrap
281
		${WRKSRC}/raddb/certs/bootstrap
278
# Clean up after the last operation (so as not to get unwanted files in raddb)
282
# Patch raddb/certs/Makefile for the full path to the openssl binary (using
279
	@${FIND} -E ${WRKSRC}/raddb/certs -regex '.*/bootstrap\.(orig|bak)$$' \
283
# ports OpenSSL if installed)
284
	@${REINPLACE_CMD} -E \
285
		-e "s:^([[:space:]])+openssl:\1${OPENSSLBASE}/bin/openssl:g" \
286
		${WRKSRC}/raddb/certs/Makefile
287
# Clean up after the last two operations (so as not to get unwanted files in
288
# raddb)
289
	@${FIND} -E ${WRKSRC}/raddb/certs \
290
		-regex '.*/(bootstrap|Makefile)\.(orig|bak)$$' \
280
		-delete
291
		-delete
281
# If EXPERIMENTAL (and therefore DHCP) is enabled, enable the DHCP dictionary
292
# If EXPERIMENTAL (and therefore DHCP) is enabled, enable the DHCP dictionary
282
.ifdef(WITH_EXPERIMENTAL)
293
.ifdef(WITH_EXPERIMENTAL)
283
	@${REINPLACE_CMD} -Ee 's:^#(.+ dictionary\.dhcp)$$:\1:g' \
294
	@${REINPLACE_CMD} -Ee 's:^#(.+ dictionary\.dhcp)$$:\1:g' \
284
		${WRKSRC}/share/dictionary
295
		${WRKSRC}/share/dictionary
296
# Clean up (so as not to get an unwanted file in share)
297
	@${FIND} -E ${WRKSRC}/share \
298
		-regex '.*/dictionary\.(orig|bak)$$' \
299
		-delete
285
.endif
300
.endif
286
# Patch scripts/Makefile not to install (unnecessary) rc.radiusd
301
# Patch scripts/Makefile not to install (unnecessary) rc.radiusd
287
	@${REINPLACE_CMD} -Ee 's:^(.+rc\.radiusd.+)$$:#\1:g' \
302
	@${REINPLACE_CMD} -Ee 's:^(.+rc\.radiusd.+)$$:#\1:g' \

Return to bug 133532