Attachment #77022 for bug #110948

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

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (freeradius-1.1.4.tar.gz) = 0027d4cf8882bbafee30755a16632c6a	1	MD5 (freeradius-1.1.5.tar.bz2) = e90c7976a3dcd80368ff3ed2b768b3a4
2	SHA256 (freeradius-1.1.4.tar.gz) = 017fe27b59c8d16c61739cd8aec123150365f2885dfdf04d289bf3039f26f7e3	2	SHA256 (freeradius-1.1.5.tar.bz2) = 02afff2d76edff01d2d94dc62f1168d49746a158e16c257083d22e8440e7ee96
3	SIZE (freeradius-1.1.4.tar.gz) = 3088835	3	SIZE (freeradius-1.1.5.tar.bz2) = 2028582




--- raddb/Makefile.orig	Wed Jan 25 13:01:45 2006
+++ raddb/Makefile	Wed Jan 25 13:22:54 2006
@@ -15,26 +15,11 @@
 	$(INSTALL) -d -m 755	$(R)$(raddbdir)
 	@echo "Creating/updating files in $(R)$(raddbdir)"; \
 	for i in $(FILES); do \
-		[ ! -f $(R)$(raddbdir)/$$i ] && $(INSTALL) -m 644 $$i $(R)$(raddbdir); \
-		if [ "`find $$i -newer $(R)$(raddbdir)/$$i`" ]; then \
-			echo "** $(R)$(raddbdir)/$$i"; \
-			nt=1; \
-		fi; \
-	done; \
-	if [ "$$nt" ]; then \
-		echo "**";\
-		echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\
-		echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\
-		echo "**";\
-		echo "** The sample configuration files in `pwd`";\
-		echo "** are newer than those in $(R)$(raddbdir)";\
-		echo "**";\
-		echo "** Please investigate and manually copy (if appropriate) the files listed above.";\
-		echo "**";\
-		echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\
-		echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\
-	fi
-	chmod 640 $(R)$(raddbdir)/naspasswd $(R)$(raddbdir)/clients $(R)$(raddbdir)/clients.conf
+		$(INSTALL) -m 644 $$i $(R)$(raddbdir)/$$i.sample; \
+	done
+	chmod 640 $(R)$(raddbdir)/naspasswd.sample \
+		$(R)$(raddbdir)/clients.sample \
+		$(R)$(raddbdir)/clients.conf.sample
 	if [ ! -d $(R)$(raddbdir)/certs ]; then \
 		mkdir $(R)$(raddbdir)/certs; \
 		mkdir $(R)$(raddbdir)/certs/demoCA; \

Lines 1-11 Link Here

(-)files/patch-Make.inc.in (-11 lines)
1	--- Make.inc.in.orig Mon Mar 27 15:03:38 2006
2	+++ Make.inc.in Mon Mar 27 15:03:55 2006
3	@@ -25,7 +25,7 @@
4	CC = @CC@
5	RANLIB = @RANLIB@
6	INCLUDE =
7	-CFLAGS = $(INCLUDE) @CFLAGS@ @LFS_CFLAGS@
8	+CFLAGS = $(INCLUDE) @CFLAGS@ @CPPFLAGS@ @LFS_CFLAGS@
9	CPPFLAGS = @CPPFLAGS@
10	LIBPREFIX = @LIBPREFIX@
11	EXEEXT = @EXEEXT@




--- src/main/Makefile.in.orig	Wed Feb 14 15:44:23 2007
+++ src/main/Makefile.in	Mon Mar 12 13:20:32 2007
@@ -61,9 +61,9 @@
 CFLAGS		+= -DHOSTINFO=\"${HOSTINFO}\"
 CFLAGS		+= -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
 CFLAGS		+= $(SNMP_INCLUDE)
+LDFLAGS_MAIN   	= -L../lib $(LDFLAGS)
 VFLAGS		= -DRADIUSD_MAJOR_VERSION=$(RADIUSD_MAJOR_VERSION)
 VFLAGS		+= -DRADIUSD_MINOR_VERSION=$(RADIUSD_MINOR_VERSION)
 MODULE_LIBS	= $(STATIC_MODULES)
@@ -60,9 +61,9 @@
 
 radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la
 	$(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
-		$(LDFLAGS) -pie $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
+		$(CFLAGS) $(LDFLAGS) -pie $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
 		$(MODULE_LIBS) $(LIBS) $(SNMP_LIBS) $(PTHREADLIB) \
		$(LIBLTDL) $(OPENSSL_LIBS)
+		$(LIBLTDL) $(LCRYPT)
 
 radiusd.lo: radiusd.c ../include/request_list.h ../include/modules.h ../include/modcall.h ../include/modpriv.h
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radiusd.c

 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radclient.c
 
 radclient: radclient.lo ../lib/libradius.la
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radclient radclient.lo $(LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radclient radclient.lo $(LIBS)
 
 radrelay.lo: radrelay.c $(INCLUDES)
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radrelay.c
 
 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
 
 radwho: radwho.lo util.lo log.lo conffile.lo ../lib/libradius.la
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radwho radwho.lo util.lo log.lo conffile.lo $(LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radwho radwho.lo util.lo log.lo conffile.lo $(LIBS)
 
 
 clean:

Lines 1-8 Link Here

(-)files/radiusd.sh.in (-2 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2		2
3	# PROVIDE: radiusd	3	# PROVIDE: radiusd
4	# REQUIRE: NETWORKING SERVERS	4	# REQUIRE: %%REQUIRE%%
5	# BEFORE: DAEMON
6	# KEYWORD: shutdown	5	# KEYWORD: shutdown
7		6
8	#	7	#




bin/rlm_dbm_parser
bin/rlm_ippool_tool
bin/smbencrypt
@unexec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type f -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -f %D/%%EXAMPLESDIR%%/raddb/${i} ]; then if cmp -s %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; then rm -f %D/etc/raddb/${i}; fi; fi; done
@unexec for i in `find -d %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -d %D/etc/raddb/${i} ]; then rmdir %D/etc/raddb/${i} 2>/dev/null || true; fi; done
%%EXAMPLESDIR%%/raddb/acct_users
%%EXAMPLESDIR%%/raddb/attrs
%%EXAMPLESDIR%%/raddb/certs/README
%%EXAMPLESDIR%%/raddb/certs/cert-clt.der
%%EXAMPLESDIR%%/raddb/certs/cert-clt.p12
%%EXAMPLESDIR%%/raddb/certs/cert-clt.pem
%%EXAMPLESDIR%%/raddb/certs/cert-srv.der
%%EXAMPLESDIR%%/raddb/certs/cert-srv.p12
%%EXAMPLESDIR%%/raddb/certs/cert-srv.pem
%%EXAMPLESDIR%%/raddb/certs/demoCA/cacert.pem
%%EXAMPLESDIR%%/raddb/certs/demoCA/index.txt
%%EXAMPLESDIR%%/raddb/certs/demoCA/index.txt.old
%%EXAMPLESDIR%%/raddb/certs/demoCA/serial
%%EXAMPLESDIR%%/raddb/certs/demoCA/serial.old
%%EXAMPLESDIR%%/raddb/certs/dh
%%EXAMPLESDIR%%/raddb/certs/newcert.pem
%%EXAMPLESDIR%%/raddb/certs/newreq.pem
%%EXAMPLESDIR%%/raddb/certs/random
%%EXAMPLESDIR%%/raddb/certs/root.der
%%EXAMPLESDIR%%/raddb/certs/root.p12
%%EXAMPLESDIR%%/raddb/certs/root.pem
%%EXAMPLESDIR%%/raddb/clients.conf
%%EXAMPLESDIR%%/raddb/clients
%%EXAMPLESDIR%%/raddb/dictionary
%%EXAMPLESDIR%%/raddb/eap.conf
%%EXAMPLESDIR%%/raddb/example.pl
%%EXAMPLESDIR%%/raddb/experimental.conf
%%EXAMPLESDIR%%/raddb/hints
%%EXAMPLESDIR%%/raddb/huntgroups
%%EXAMPLESDIR%%/raddb/ldap.attrmap
%%EXAMPLESDIR%%/raddb/mssql.conf
%%EXAMPLESDIR%%/raddb/naslist
%%EXAMPLESDIR%%/raddb/naspasswd
%%EXAMPLESDIR%%/raddb/oraclesql.conf
%%EXAMPLESDIR%%/raddb/otp.conf
%%EXAMPLESDIR%%/raddb/postgresql.conf
%%EXAMPLESDIR%%/raddb/preproxy_users
%%EXAMPLESDIR%%/raddb/proxy.conf
%%EXAMPLESDIR%%/raddb/radiusd.conf
%%EXAMPLESDIR%%/raddb/realms
%%EXAMPLESDIR%%/raddb/snmp.conf
%%EXAMPLESDIR%%/raddb/sql.conf
%%EXAMPLESDIR%%/raddb/sqlippool.conf
%%EXAMPLESDIR%%/raddb/users
@exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -d %D/etc/raddb/${i} ]; then mkdir -p %D/etc/raddb/${i}; fi; done
@exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type f -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -f %D/etc/raddb/${i} ]; then cp -p %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; fi; done
@dirrm %%EXAMPLESDIR%%/raddb/certs/demoCA
@dirrm %%EXAMPLESDIR%%/raddb/certs
@dirrm %%EXAMPLESDIR%%/raddb
@dirrm %%EXAMPLESDIR%%
lib/libeap-%%PORTVERSION%%.la
lib/libeap-%%PORTVERSION%%.so
lib/libeap.a

lib/rlm_sql.a
lib/rlm_sql.la
lib/rlm_sql.so
%%FIREBIRD%%lib/rlm_sql_firebird-%%PORTVERSION%%.so
%%FIREBIRD%%lib/rlm_sql_firebird.a
%%FIREBIRD%%lib/rlm_sql_firebird.la
%%FIREBIRD%%lib/rlm_sql_firebird.so
lib/rlm_sql_log-%%PORTVERSION%%.la
lib/rlm_sql_log-%%PORTVERSION%%.so
lib/rlm_sql_log.a

lib/rlm_sqlcounter.a
lib/rlm_sqlcounter.la
lib/rlm_sqlcounter.so
%%EXPM%%lib/rlm_sqlhpwippool-%%PORTVERSION%%.la
%%EXPM%%lib/rlm_sqlhpwippool-%%PORTVERSION%%.so
%%EXPM%%lib/rlm_sqlhpwippool.a
%%EXPM%%lib/rlm_sqlhpwippool.la
%%EXPM%%lib/rlm_sqlhpwippool.so
%%EXPM%%lib/rlm_sqlippool-%%PORTVERSION%%.la
%%EXPM%%lib/rlm_sqlippool-%%PORTVERSION%%.so
%%EXPM%%lib/rlm_sqlippool.a
%%EXPM%%lib/rlm_sqlippool.la
%%EXPM%%lib/rlm_sqlippool.so
lib/rlm_unix-%%PORTVERSION%%.la
lib/rlm_unix-%%PORTVERSION%%.so
lib/rlm_unix.a

%%DATADIR%%/dictionary.aptis
%%DATADIR%%/dictionary.aruba
%%DATADIR%%/dictionary.ascend
%%DATADIR%%/dictionary.asn
%%DATADIR%%/dictionary.avaya
%%DATADIR%%/dictionary.bay
%%DATADIR%%/dictionary.bintec

%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm etc/raddb/certs/demoCA
@dirrm etc/raddb/certs
@exec mkdir -p /var/log/raddb
@exec chmod -R og= /var/log/raddb
@exec mkdir -p /var/run/radiusd
@unexec rm -fr /var/run/radiusd
@dirrmtry etc/raddb/certs/demoCA
@dirrmtry etc/raddb/certs
@dirrmtry etc/raddb
@unexec if [ -d %D/etc/raddb ]; then echo "You should remove %D/etc/raddb if you don't need it anymore."; fi

Lines 6-13 Link Here

(-)Makefile (-19 / +73 lines)
6	#	6	#
7		7
8	PORTNAME= freeradius	8	PORTNAME= freeradius
9	PORTVERSION= 1.1.4	9	PORTVERSION?= 1.1.5
10	PORTREVISION= 1	10	PORTREVISION?= 0
11	CATEGORIES= net	11	CATEGORIES= net
12	MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \	12	MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
13	ftp://ftp.ntua.gr/pub/net/radius/freeradius/ \	13	ftp://ftp.ntua.gr/pub/net/radius/freeradius/ \
Lines 16-29 Link Here
16	ftp://ftp.freeradius.org/pub/radius/old/ \	16	ftp://ftp.freeradius.org/pub/radius/old/ \
17	http://freeradius.portal-to-web.de/	17	http://freeradius.portal-to-web.de/
18		18
19	MAINTAINER= david@wood2.org.uk	19	MAINTAINER?= david@wood2.org.uk
20	COMMENT= A free RADIUS server implementation	20	COMMENT?= A free RADIUS server implementation
		21
		22	USE_BZIP2= yes
21		23
22	LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm	24	LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
23		25
24	LOGDIR?= /var/log	26	LOGDIR?= /var/log
25		27
		28	# If FREERADIUS_SLAVE_MYSQL is defined, we want to build the
		29	# freeradius-mysql slave port
		30
26	CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*	31	CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
		32	.ifdef(FREERADIUS_SLAVE_MYSQL)
		33	CONFLICTS+= freeradius-1.*
		34	PKGNAMESUFFIX= -mysql
		35	.else
		36	CONFLICTS+= freeradius-mysql-1.*
		37	.endif
27		38
28	USE_RC_SUBR= radiusd.sh	39	USE_RC_SUBR= radiusd.sh
29	USE_AUTOTOOLS= libltdl:15 libtool:15	40	USE_AUTOTOOLS= libltdl:15 libtool:15
Lines 36-44 Link Here
36		47
37	OPTIONS= KERBEROS "With Kerberos support" off \	48	OPTIONS= KERBEROS "With Kerberos support" off \
38	HEIMDAL "With Heimdal Kerberos support" off \	49	HEIMDAL "With Heimdal Kerberos support" off \
39	LDAP "With LDAP user database" off \	50	LDAP "With LDAP database support" off
40	MYSQL "With MySQL user database" off \	51	.ifndef(FREERADIUS_SLAVE_MYSQL)
41	PGSQL "With PostgreSQL use database" off \	52	OPTIONS+= MYSQL "With MySQL database support" off
		53	.endif
		54	OPTIONS+= PGSQL "With PostgreSQL database support" off \
		55	FIREBIRD "With Firebird database support (EXPERIMENTAL)" off \
42	SNMP "With SNMP support" off \	56	SNMP "With SNMP support" off \
43	EDIR "With Novell eDirectory support" off \	57	EDIR "With Novell eDirectory support" off \
44	NOPERL "Do not require perl (use only if necessary)" off \	58	NOPERL "Do not require perl (use only if necessary)" off \
Lines 46-51 Link Here
46		60
47	.include <bsd.port.pre.mk>	61	.include <bsd.port.pre.mk>
48		62
		63	# Default requirements for rc script
		64	_REQUIRE= NETWORKING SERVERS
		65
		66	.ifdef(FREERADIUS_SLAVE_MYSQL)
		67	WITH_MYSQL= yes
		68	.endif
		69
49	CONFIGURE_ARGS= --quiet \	70	CONFIGURE_ARGS= --quiet \
50	--prefix=${PREFIX} \	71	--prefix=${PREFIX} \
51	--localstatedir=/var \	72	--localstatedir=/var \
Lines 56-65 Link Here
56	--with-large-files \	77	--with-large-files \
57	--with-openssl-includes=${OPENSSLINC} \	78	--with-openssl-includes=${OPENSSLINC} \
58	--with-openssl-libraries=${OPENSSLLIB} \	79	--with-openssl-libraries=${OPENSSLLIB} \
59	--without-rlm_sql_unixodbc \	80	--without-rlm_sql_db2 \
60	--without-rlm_sql_oracle \	81	--without-rlm_sql_freetds \
61	--without-rlm_sql_iodbc \	82	--without-rlm_sql_iodbc \
62	--without-rlm_sql_db2	83	--without-rlm_sql_oracle \
		84	--without-rlm_sql_sybase \
		85	--without-rlm_sql_unixodbc
63		86
64	.if ${OSVERSION} < 500000 && ${OPENSSLBASE} == "/usr"	87	.if ${OSVERSION} < 500000 && ${OPENSSLBASE} == "/usr"
65	PLIST_SUB+= 4SSL="@comment "	88	PLIST_SUB+= 4SSL="@comment "
Lines 97-102 Link Here
97	.ifdef(WITH_LDAP)	120	.ifdef(WITH_LDAP)
98	USE_OPENLDAP= YES	121	USE_OPENLDAP= YES
99	PLIST_SUB+= LDAP=""	122	PLIST_SUB+= LDAP=""
		123	_REQUIRE+= slapd
100	.else	124	.else
101	CONFIGURE_ARGS+=--without-rlm_ldap	125	CONFIGURE_ARGS+=--without-rlm_ldap
102	PLIST_SUB+= LDAP="@comment "	126	PLIST_SUB+= LDAP="@comment "
Lines 108-114 Link Here
108		132
109	.ifdef(WITH_MYSQL)	133	.ifdef(WITH_MYSQL)
110	USE_MYSQL= YES	134	USE_MYSQL= YES
		135	CONFIGURE_ARGS+=--with-rlm_sql_mysql
111	PLIST_SUB+= MYSQL=""	136	PLIST_SUB+= MYSQL=""
		137	_REQUIRE+= mysql
112	.else	138	.else
113	CONFIGURE_ARGS+=--without-rlm_sql_mysql	139	CONFIGURE_ARGS+=--without-rlm_sql_mysql
114	PLIST_SUB+= MYSQL="@comment "	140	PLIST_SUB+= MYSQL="@comment "
Lines 116-127 Link Here
116		142
117	.ifdef(WITH_PGSQL)	143	.ifdef(WITH_PGSQL)
118	USE_PGSQL= YES	144	USE_PGSQL= YES
		145	CONFIGURE_ARGS+=--with-rlm_sql_postgresql
119	PLIST_SUB+= PGSQL=""	146	PLIST_SUB+= PGSQL=""
		147	_REQUIRE+= postgresql
120	.else	148	.else
121	CONFIGURE_ARGS+=--without-rlm_sql_postgresql	149	CONFIGURE_ARGS+=--without-rlm_sql_postgresql
122	PLIST_SUB+= PGSQL="@comment "	150	PLIST_SUB+= PGSQL="@comment "
123	.endif	151	.endif
124		152
		153	.ifdef(WITH_FIREBIRD)
		154	USE_FIREBIRD= YES
		155	CONFIGURE_ARGS+=--with-rlm_sql_firebird
		156	PLIST_SUB+= FIREBIRD=""
		157	.else
		158	CONFIGURE_ARGS+=--without-rlm_sql_firebird
		159	PLIST_SUB+= FIREBIRD="@comment "
		160	.endif
		161
		162	# Firebird module is still experimental
		163	.if defined(WITH_FIREBIRD) && !defined(WITH_EXPERIMENTAL)
		164	WITH_EXPERIMENTAL= yes
		165	.endif
		166
125	.ifdef(WITH_SNMP)	167	.ifdef(WITH_SNMP)
126	LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4	168	LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
127	.else	169	.else
Lines 169-175 Link Here
169	DICTS= dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \	211	DICTS= dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
170	dictionary.airespace dictionary.alcatel dictionary.alteon \	212	dictionary.airespace dictionary.alcatel dictionary.alteon \
171	dictionary.altiga dictionary.alvarion dictionary.aptis \	213	dictionary.altiga dictionary.alvarion dictionary.aptis \
172	dictionary.aruba dictionary.ascend dictionary.avaya \	214	dictionary.aruba dictionary.ascend dictionary.asn dictionary.avaya \
173	dictionary.bay dictionary.bintec dictionary.bristol \	215	dictionary.bay dictionary.bintec dictionary.bristol \
174	dictionary.cablelabs dictionary.cabletron dictionary.cisco \	216	dictionary.cablelabs dictionary.cabletron dictionary.cisco \
175	dictionary.cisco.bbsm dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \	217	dictionary.cisco.bbsm dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \
Lines 199-210 Link Here
199	dictionary.versanet dictionary.walabi dictionary.waverider \	241	dictionary.versanet dictionary.walabi dictionary.waverider \
200	dictionary.wispr dictionary.xedia dictionary.xylan dictionary.zyxel	242	dictionary.wispr dictionary.xedia dictionary.xylan dictionary.zyxel
201		243
		244	SUB_LIST+= REQUIRE="${_REQUIRE}"
		245
202	post-patch:	246	post-patch:
203	@${RM} ${WRKSRC}/doc/Makefile.orig	247	# Patch Makefile / Makefile.in throughout the source tree to install in EXAMPLESDIR not raddb
204	# rlm_sql_firebird in 1.1.4 makes configure fail with experimental modules enabled,	248	@for i in `${FIND} -E ${WRKSRC} -regex '.*Makefile(\.in)?$$' -print` ; do \
205	# even though the port implicitly issues --without-rlm_sql_firebird. Delete the module	249	${REINPLACE_CMD} -e "s:\$$(R)\$$(raddbdir):${EXAMPLESDIR}/raddb:g" $${i}; \
206	# until it is fixed	250	done
207	@${RM} -r ${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_firebird	251	@for i in `${FIND} -E ${WRKSRC} -regex '.*Makefile(\.in)?\.(orig\|bak)$$' -print` ; do \
		252	${RM} $${i}; \
		253	done
208	.if ${OSVERSION} < 500000	254	.if ${OSVERSION} < 500000
209	@${REINPLACE_CMD} -e 's/-DNO_OPENSSL//' ${WRKSRC}/configure	255	@${REINPLACE_CMD} -e 's/-DNO_OPENSSL//' ${WRKSRC}/configure
210	.endif	256	.endif
Lines 214-222 Link Here
214	.for dict in ${DICTS}	260	.for dict in ${DICTS}
215	${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict}	261	${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict}
216	.endfor	262	.endfor
217	for i in `${FIND} ${PREFIX}/etc/raddb -maxdepth 1 -regex '.*\.sample' -print \	263	for i in `${FIND} ${EXAMPLESDIR}/raddb/ -type d -mindepth 1 -print \
218	\| ${SED} -e 's/\.sample//g'`; do \	264	\| ${SED} -e 's:^${EXAMPLESDIR}/raddb/::g'`; do \
219	if [ ! -f $${i} ]; then ${CP} -p $${i}.sample $${i}; fi; \	265	if [ ! -d ${PREFIX}/etc/raddb/$${i} ]; then \
		266	${MKDIR} ${PREFIX}/etc/raddb/$${i}; \
		267	fi; \
		268	done
		269	for i in `${FIND} ${EXAMPLESDIR}/raddb/ -type f -print \
		270	\| ${SED} -e 's:^${EXAMPLESDIR}/raddb/::g'`; do \
		271	if [ ! -f ${PREFIX}/etc/raddb/$${i} ]; then \
		272	${CP} -p ${EXAMPLESDIR}/raddb/$${i} ${PREFIX}/etc/raddb/$${i}; \
		273	fi; \
220	done	274	done
221		275
222	.include <bsd.port.post.mk>	276	.include <bsd.port.post.mk>

Return to bug 110948

Lines 1-34 Link Here

(-)files/patch-raddb-Makefile (-34 lines)
1	--- raddb/Makefile.orig Wed Jan 25 13:01:45 2006
2	+++ raddb/Makefile Wed Jan 25 13:22:54 2006
3	@@ -15,26 +15,11 @@
4	$(INSTALL) -d -m 755 $(R)$(raddbdir)
5	@echo "Creating/updating files in $(R)$(raddbdir)"; \
6	for i in $(FILES); do \
7	- [ ! -f $(R)$(raddbdir)/$$i ] && $(INSTALL) -m 644 $$i $(R)$(raddbdir); \
8	- if [ "`find $$i -newer $(R)$(raddbdir)/$$i`" ]; then \
9	- echo "** $(R)$(raddbdir)/$$i"; \
10	- nt=1; \
11	- fi; \
12	- done; \
13	- if [ "$$nt" ]; then \
14	- echo "**";\
15	- echo " WARNING WARNING WARNING WARNING WARNING WARNING WARNING ";\
16	- echo " WARNING WARNING WARNING WARNING WARNING WARNING WARNING ";\
17	- echo "**";\
18	- echo "** The sample configuration files in `pwd`";\
19	- echo "** are newer than those in $(R)$(raddbdir)";\
20	- echo "**";\
21	- echo "** Please investigate and manually copy (if appropriate) the files listed above.";\
22	- echo "**";\
23	- echo " WARNING WARNING WARNING WARNING WARNING WARNING WARNING ";\
24	- echo " WARNING WARNING WARNING WARNING WARNING WARNING WARNING ";\
25	- fi
26	- chmod 640 $(R)$(raddbdir)/naspasswd $(R)$(raddbdir)/clients $(R)$(raddbdir)/clients.conf
27	+ $(INSTALL) -m 644 $$i $(R)$(raddbdir)/$$i.sample; \
28	+ done
29	+ chmod 640 $(R)$(raddbdir)/naspasswd.sample \
30	+ $(R)$(raddbdir)/clients.sample \
31	+ $(R)$(raddbdir)/clients.conf.sample
32	if [ ! -d $(R)$(raddbdir)/certs ]; then \
33	mkdir $(R)$(raddbdir)/certs; \
34	mkdir $(R)$(raddbdir)/certs/demoCA; \

Lines 1-45 Link Here

(-)files/patch-src-main-Makefile.in (-38 / +7 lines)
1	--- src/main/Makefile.in.orig Mon Aug 21 13:47:46 2006	1	--- src/main/Makefile.in.orig Wed Feb 14 15:44:23 2007
2	+++ src/main/Makefile.in Fri Oct 27 12:18:50 2006	2	+++ src/main/Makefile.in Mon Mar 12 13:20:32 2007
3	@@ -19,6 +19,7 @@	3	@@ -61,9 +61,9 @@
4	CFLAGS += -DHOSTINFO=\"${HOSTINFO}\"
5	CFLAGS += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
6	CFLAGS += $(SNMP_INCLUDE)
7	+LDFLAGS_MAIN = -L../lib $(LDFLAGS)
8	VFLAGS = -DRADIUSD_MAJOR_VERSION=$(RADIUSD_MAJOR_VERSION)
9	VFLAGS += -DRADIUSD_MINOR_VERSION=$(RADIUSD_MINOR_VERSION)
10	MODULE_LIBS = $(STATIC_MODULES)
11	@@ -60,9 +61,9 @@
12		4
13	radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la	5	radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la
14	$(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \	6	$(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
15	- $(LDFLAGS) $(LINK_MODE) -o $@ $(SERVER_OBJS) \	7	- $(LDFLAGS) -pie $(LINK_MODE) -o $@ $(SERVER_OBJS) \
16	+ $(CFLAGS) $(LDFLAGS_MAIN) $(LINK_MODE) -o $@ $(SERVER_OBJS) \	8	+ $(CFLAGS) $(LDFLAGS) -pie $(LINK_MODE) -o $@ $(SERVER_OBJS) \
17	$(MODULE_LIBS) $(LIBS) $(SNMP_LIBS) $(PTHREADLIB) \	9	$(MODULE_LIBS) $(LIBS) $(SNMP_LIBS) $(PTHREADLIB) \
18	- $(LIBLTDL)	10	$(LIBLTDL) $(OPENSSL_LIBS)
19	+ $(LIBLTDL) $(LCRYPT)
20		11
21	radiusd.lo: radiusd.c ../include/request_list.h ../include/modules.h ../include/modcall.h ../include/modpriv.h	12	radiusd.lo: radiusd.c ../include/request_list.h ../include/modules.h ../include/modcall.h ../include/modpriv.h
22	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radiusd.c	13	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radiusd.c
23	@@ -141,19 +142,19 @@	14
24	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radclient.c
25
26	radclient: radclient.lo ../lib/libradius.la
27	- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radclient radclient.lo $(LIBS)
28	+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radclient radclient.lo $(LIBS)
29
30	radrelay.lo: radrelay.c $(INCLUDES)
31	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radrelay.c
32
33	radrelay: radrelay.lo util.lo nas.lo client.lo log.lo conffile.lo files.lo xlat.lo ../lib/libradius.la
34	- $(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)
35	+ $(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)
36
37	radwho.lo: radwho.c $(INCLUDES)
38	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radwho.c
39
40	radwho: radwho.lo util.lo log.lo conffile.lo ../lib/libradius.la
41	- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINK_MODE) -o radwho radwho.lo util.lo log.lo conffile.lo $(LIBS)
42	+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS_MAIN) $(LINK_MODE) -o radwho radwho.lo util.lo log.lo conffile.lo $(LIBS)
43
44
45	clean:

Lines 12-63 Link Here

(-)pkg-plist (-48 / +69 lines)
12	bin/rlm_dbm_parser	12	bin/rlm_dbm_parser
13	bin/rlm_ippool_tool	13	bin/rlm_ippool_tool
14	bin/smbencrypt	14	bin/smbencrypt
15	@unexec for i in `find %D/etc/raddb -maxdepth 1 -regex '.*\.sample' -print \| sed -e 's/\.sample//g'`; do if [ -f ${i} ]; then if cmp -s ${i}.sample ${i}; then rm -f ${i}; fi; fi; done	15	@unexec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type f -print \| sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -f %D/%%EXAMPLESDIR%%/raddb/${i} ]; then if cmp -s %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; then rm -f %D/etc/raddb/${i}; fi; fi; done
16	etc/raddb/acct_users.sample	16	@unexec for i in `find -d %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print \| sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -d %D/etc/raddb/${i} ]; then rmdir %D/etc/raddb/${i} 2>/dev/null \|\| true; fi; done
17	etc/raddb/attrs.sample	17	%%EXAMPLESDIR%%/raddb/acct_users
18	etc/raddb/certs/README	18	%%EXAMPLESDIR%%/raddb/attrs
19	etc/raddb/certs/cert-clt.der	19	%%EXAMPLESDIR%%/raddb/certs/README
20	etc/raddb/certs/cert-clt.p12	20	%%EXAMPLESDIR%%/raddb/certs/cert-clt.der
21	etc/raddb/certs/cert-clt.pem	21	%%EXAMPLESDIR%%/raddb/certs/cert-clt.p12
22	etc/raddb/certs/cert-srv.der	22	%%EXAMPLESDIR%%/raddb/certs/cert-clt.pem
23	etc/raddb/certs/cert-srv.p12	23	%%EXAMPLESDIR%%/raddb/certs/cert-srv.der
24	etc/raddb/certs/cert-srv.pem	24	%%EXAMPLESDIR%%/raddb/certs/cert-srv.p12
25	etc/raddb/certs/demoCA/cacert.pem	25	%%EXAMPLESDIR%%/raddb/certs/cert-srv.pem
26	etc/raddb/certs/demoCA/index.txt	26	%%EXAMPLESDIR%%/raddb/certs/demoCA/cacert.pem
27	etc/raddb/certs/demoCA/index.txt.old	27	%%EXAMPLESDIR%%/raddb/certs/demoCA/index.txt
28	etc/raddb/certs/demoCA/serial	28	%%EXAMPLESDIR%%/raddb/certs/demoCA/index.txt.old
29	etc/raddb/certs/demoCA/serial.old	29	%%EXAMPLESDIR%%/raddb/certs/demoCA/serial
30	etc/raddb/certs/dh	30	%%EXAMPLESDIR%%/raddb/certs/demoCA/serial.old
31	etc/raddb/certs/newcert.pem	31	%%EXAMPLESDIR%%/raddb/certs/dh
32	etc/raddb/certs/newreq.pem	32	%%EXAMPLESDIR%%/raddb/certs/newcert.pem
33	etc/raddb/certs/random	33	%%EXAMPLESDIR%%/raddb/certs/newreq.pem
34	etc/raddb/certs/root.der	34	%%EXAMPLESDIR%%/raddb/certs/random
35	etc/raddb/certs/root.p12	35	%%EXAMPLESDIR%%/raddb/certs/root.der
36	etc/raddb/certs/root.pem	36	%%EXAMPLESDIR%%/raddb/certs/root.p12
37	etc/raddb/clients.conf.sample	37	%%EXAMPLESDIR%%/raddb/certs/root.pem
38	etc/raddb/clients.sample	38	%%EXAMPLESDIR%%/raddb/clients.conf
39	etc/raddb/dictionary.sample	39	%%EXAMPLESDIR%%/raddb/clients
40	etc/raddb/eap.conf.sample	40	%%EXAMPLESDIR%%/raddb/dictionary
41	etc/raddb/example.pl	41	%%EXAMPLESDIR%%/raddb/eap.conf
42	etc/raddb/experimental.conf.sample	42	%%EXAMPLESDIR%%/raddb/example.pl
43	etc/raddb/hints.sample	43	%%EXAMPLESDIR%%/raddb/experimental.conf
44	etc/raddb/huntgroups.sample	44	%%EXAMPLESDIR%%/raddb/hints
45	etc/raddb/ldap.attrmap.sample	45	%%EXAMPLESDIR%%/raddb/huntgroups
46	etc/raddb/mssql.conf.sample	46	%%EXAMPLESDIR%%/raddb/ldap.attrmap
47	etc/raddb/naslist.sample	47	%%EXAMPLESDIR%%/raddb/mssql.conf
48	etc/raddb/naspasswd.sample	48	%%EXAMPLESDIR%%/raddb/naslist
49	etc/raddb/oraclesql.conf.sample	49	%%EXAMPLESDIR%%/raddb/naspasswd
50	etc/raddb/otp.conf.sample	50	%%EXAMPLESDIR%%/raddb/oraclesql.conf
51	etc/raddb/postgresql.conf.sample	51	%%EXAMPLESDIR%%/raddb/otp.conf
52	etc/raddb/preproxy_users.sample	52	%%EXAMPLESDIR%%/raddb/postgresql.conf
53	etc/raddb/proxy.conf.sample	53	%%EXAMPLESDIR%%/raddb/preproxy_users
54	etc/raddb/radiusd.conf.sample	54	%%EXAMPLESDIR%%/raddb/proxy.conf
55	etc/raddb/realms.sample	55	%%EXAMPLESDIR%%/raddb/radiusd.conf
56	etc/raddb/snmp.conf.sample	56	%%EXAMPLESDIR%%/raddb/realms
57	etc/raddb/sql.conf.sample	57	%%EXAMPLESDIR%%/raddb/snmp.conf
58	etc/raddb/sqlippool.conf.sample	58	%%EXAMPLESDIR%%/raddb/sql.conf
59	etc/raddb/users.sample	59	%%EXAMPLESDIR%%/raddb/sqlippool.conf
60	@exec for i in `find %D/etc/raddb -maxdepth 1 -regex '.*\.sample' -print \| sed -e 's/\.sample//g'`; do if [ ! -f ${i} ]; then cp -p ${i}.sample ${i}; fi; done	60	%%EXAMPLESDIR%%/raddb/users
		61	@exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print \| sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -d %D/etc/raddb/${i} ]; then mkdir -p %D/etc/raddb/${i}; fi; done
		62	@exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type f -print \| sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -f %D/etc/raddb/${i} ]; then cp -p %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; fi; done
		63	@dirrm %%EXAMPLESDIR%%/raddb/certs/demoCA
		64	@dirrm %%EXAMPLESDIR%%/raddb/certs
		65	@dirrm %%EXAMPLESDIR%%/raddb
		66	@dirrm %%EXAMPLESDIR%%
61	lib/libeap-%%PORTVERSION%%.la	67	lib/libeap-%%PORTVERSION%%.la
62	lib/libeap-%%PORTVERSION%%.so	68	lib/libeap-%%PORTVERSION%%.so
63	lib/libeap.a	69	lib/libeap.a
Lines 278-283 Link Here
278	lib/rlm_sql.a	284	lib/rlm_sql.a
279	lib/rlm_sql.la	285	lib/rlm_sql.la
280	lib/rlm_sql.so	286	lib/rlm_sql.so
		287	%%FIREBIRD%%lib/rlm_sql_firebird-%%PORTVERSION%%.so
		288	%%FIREBIRD%%lib/rlm_sql_firebird.a
		289	%%FIREBIRD%%lib/rlm_sql_firebird.la
		290	%%FIREBIRD%%lib/rlm_sql_firebird.so
281	lib/rlm_sql_log-%%PORTVERSION%%.la	291	lib/rlm_sql_log-%%PORTVERSION%%.la
282	lib/rlm_sql_log-%%PORTVERSION%%.so	292	lib/rlm_sql_log-%%PORTVERSION%%.so
283	lib/rlm_sql_log.a	293	lib/rlm_sql_log.a
Lines 296-301 Link Here
296	lib/rlm_sqlcounter.a	306	lib/rlm_sqlcounter.a
297	lib/rlm_sqlcounter.la	307	lib/rlm_sqlcounter.la
298	lib/rlm_sqlcounter.so	308	lib/rlm_sqlcounter.so
		309	%%EXPM%%lib/rlm_sqlhpwippool-%%PORTVERSION%%.la
		310	%%EXPM%%lib/rlm_sqlhpwippool-%%PORTVERSION%%.so
		311	%%EXPM%%lib/rlm_sqlhpwippool.a
		312	%%EXPM%%lib/rlm_sqlhpwippool.la
		313	%%EXPM%%lib/rlm_sqlhpwippool.so
		314	%%EXPM%%lib/rlm_sqlippool-%%PORTVERSION%%.la
		315	%%EXPM%%lib/rlm_sqlippool-%%PORTVERSION%%.so
		316	%%EXPM%%lib/rlm_sqlippool.a
		317	%%EXPM%%lib/rlm_sqlippool.la
		318	%%EXPM%%lib/rlm_sqlippool.so
299	lib/rlm_unix-%%PORTVERSION%%.la	319	lib/rlm_unix-%%PORTVERSION%%.la
300	lib/rlm_unix-%%PORTVERSION%%.so	320	lib/rlm_unix-%%PORTVERSION%%.so
301	lib/rlm_unix.a	321	lib/rlm_unix.a
Lines 411-416 Link Here
411	%%DATADIR%%/dictionary.aptis	431	%%DATADIR%%/dictionary.aptis
412	%%DATADIR%%/dictionary.aruba	432	%%DATADIR%%/dictionary.aruba
413	%%DATADIR%%/dictionary.ascend	433	%%DATADIR%%/dictionary.ascend
		434	%%DATADIR%%/dictionary.asn
414	%%DATADIR%%/dictionary.avaya	435	%%DATADIR%%/dictionary.avaya
415	%%DATADIR%%/dictionary.bay	436	%%DATADIR%%/dictionary.bay
416	%%DATADIR%%/dictionary.bintec	437	%%DATADIR%%/dictionary.bintec
Lines 498-508 Link Here
498	%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc	519	%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
499	%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples	520	%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
500	%%PORTDOCS%%@dirrm %%DOCSDIR%%	521	%%PORTDOCS%%@dirrm %%DOCSDIR%%
501	@dirrm etc/raddb/certs/demoCA
502	@dirrm etc/raddb/certs
503	@exec mkdir -p /var/log/raddb	522	@exec mkdir -p /var/log/raddb
504	@exec chmod -R og= /var/log/raddb	523	@exec chmod -R og= /var/log/raddb
505	@exec mkdir -p /var/run/radiusd	524	@exec mkdir -p /var/run/radiusd
506	@unexec rm -fr /var/run/radiusd	525	@unexec rm -fr /var/run/radiusd
		526	@dirrmtry etc/raddb/certs/demoCA
		527	@dirrmtry etc/raddb/certs
507	@dirrmtry etc/raddb	528	@dirrmtry etc/raddb
508	@unexec if [ -d %D/etc/raddb ]; then echo "You should remove %D/etc/raddb if you don't need it anymore."; fi	529	@unexec if [ -d %D/etc/raddb ]; then echo "You should remove %D/etc/raddb if you don't need it anymore."; fi