head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.54 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.52 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.50 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.48 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.46 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.44 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.42 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.40 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.38 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.36 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.34 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.32 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.30 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.28 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.26 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.24 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.22 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.20 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.18 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.16 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.14 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.12 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.10 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.8 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.6 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2002.07.10.12.36.28; author kim; state dead; branches; next 1.4; 1.4 date 99.12.05.22.46.45; author tron; state Exp; branches; next 1.3; 1.3 date 99.04.24.23.47.09; author tron; state Exp; branches; next 1.2; 1.2 date 99.04.24.23.19.05; author tron; state Exp; branches; next 1.1; 1.1 date 99.03.22.03.15.09; author kim; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.03.22.03.15.09; author kim; state Exp; branches; next ; desc @@ 1.5 log @Remove Merit RADIUS. @ text @$NetBSD: patch-aa,v 1.4 1999/12/05 22:46:45 tron Exp $ --- Makefile.orig Sun Dec 5 23:41:31 1999 +++ Makefile Sun Dec 5 23:43:38 1999 @@@@ -51,11 +51,12 @@@@ # Where the configuration files live. RADDB = ./raddb # Some installation stuff. -DAEMON_INSDIR = /usr/private/etc -BIN_INSDIR = /usr/private/etc -MAN_INSDIR = /usr/local/man -RADDB_INSDIR = /usr/private/etc/raddb.new -RADACCT_INSDIR = /usr/private/etc/radacct +DAEMON_INSDIR = ${PREFIX}/sbin +BIN_INSDIR = ${PREFIX}/sbin +MAN_INSDIR = ${PREFIX}/man +RADDB_INSDIR = /etc/raddb +RADDB_EXDIR = ${PREFIX}/share/examples/radius +RADACCT_INSDIR = /var/log # The server does not need to be owned by root, unless some shadow password # scheme needs it. You might create a user id "radius" for just this purpose. # The O G and M macros are for AIX, OSF/1 and HP-UX, see below. @@@@ -63,12 +64,12 @@@@ G = -g M = -m RADOWN = root -RADGRP = bin +RADGRP = wheel # Define COMPRESS to hold the pathname of your favourite compress program if # you need to override the default value of /usr/ucb/compress: -#COMPRESS = -DRAD_COMPRESS=\"/usr/local/bin/gzip\" -#COMPRESS_ARGS = -DCOMPRESS_ARGS=\"-9\" +COMPRESS = -DRAD_COMPRESS=\"${GNUZIP}\" +COMPRESS_ARGS = -DCOMPRESS_ARGS=\"-nf9\" # Define SRV to hold any combination of server names you'd like to override: #SRV3 = -DDEFAULT_TACACS_SERVER=\"vms.dns.name\" @@@@ -78,8 +79,8 @@@@ # Define DIRS to hold any combination of directory names you'd like to override: #DIRS2 = -DDEFAULT_DIR=\"../raddb\" -DDEFAULT_DIR2=\"$(RADDB_INSDIR)\" -#DIRS1 = -DRADIUS_DIR=\"$(RADDB_INSDIR)\" -DRADACCT_DIR=\"$(RADACCT_INSDIR)\" -#DIRS = $(DIRS1) $(DIRS2) +DIRS1 = -DRADIUS_DIR=\"$(RADDB_INSDIR)\" -DRADACCT_DIR=\"$(RADACCT_INSDIR)\" +DIRS = $(DIRS1) $(DIRS2) # Define CHK_SHELLS to enable /etc/shells checking: CHK_SHELLS = -DCHK_SHELLS @@@@ -90,13 +91,13 @@@@ # -DBINARY_FILTERS - support for Ascend binary filters # -DIP_ADDR_POOL - support for Ascend IP address pools # -ASCEND = -DASCEND -DBINARY_FILTERS +ASCEND = -DASCEND -DBINARY_FILTERS -DIP_ADDR_POOL # Define USR_CCA to enable USR support: #USR = -DUSR_CCA # Define RAD_LOG_FMT to change how the logfile name changes: -RAD_LOG_FMT = -DRADIUS_LOG_FMT=\"logfile.%y%m%d\" +RAD_LOG_FMT = -DRADIUS_LOG_FMT=\"radius\" STUFF = $(DIRS) $(SRV) $(COMPRESS) $(COMPRESS_ARGS) $(CHK_SHELLS) \ $(ASCEND) $(USR) @@@@ -122,10 +123,10 @@@@ # radiusd -- the default # #-------------------------------------------------------------------------- -DEFS = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) \ - -DMODVERSION -RADLIBS = ./logdaemon-5.6/skey/libskey.a -INCS = -I./logdaemon-5.6/skey +#DEFS = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) \ +# -DMODVERSION +#RADLIBS = ./logdaemon-5.6/skey/libskey.a +#INCS = -I./logdaemon-5.6/skey # # mkerb @@@@ -186,9 +187,9 @@@@ $(OBJ)/fsm.o $(OBJ)/fwd2nas.o $(OBJ)/nas_reb.o $(OBJ)/res_qry.o \ $(OBJ)/rf_req.o $(OBJ)/rf_resp.o $(OBJ)/arades.o $(OBJ)/cache.o \ $(OBJ)/pooladdr.o $(OBJ)/rad.bsd.o \ + $(OBJ)/rad.simult.o \ $(OBJ)/rad.skey.o \ - $(OBJ)/rad.ftp.o \ - $(OBJ)/modversion.o + $(OBJ)/rad.ftp.o LIB_OBJS = $(OBJ)/des.o $(OBJ)/dict.o $(OBJ)/filters.o $(OBJ)/funcs.o \ $(OBJ)/md5.o $(OBJ)/sendserver.o $(OBJ)/users.o $(OBJ)/resources.o \ @@@@ -236,12 +237,12 @@@@ # #-------------------------------------------------------------------------- -CC = cc -CFLAGS = -g $(DEFS) $(INCS) -LDFLAGS = -LIBS = -RANLIB = ranlib -INSTALL = /bin/install +#CC = cc +#CFLAGS = -g $(DEFS) $(INCS) +#LDFLAGS = +#LIBS = +#RANLIB = ranlib +#INSTALL = /bin/install # # Solaris 2.x [[NB: if BIND/named not SMCC, try CFLAGS = ... -DBSD=1 ...]] @@@@ -438,6 +439,8 @@@@ # You must un-comment one, and only one, of the above sections! +CFLAGS+= ${MERIT} ${STUFF} + # No modifications are necessary below this line except possibly near line 500. all: notice $(RADIUS) utils @@@@ -696,26 +699,26 @@@@ $(MAN_INSDIR)/man8/radpwtst.8 config-install: $(CONFIGS) - -if [ ! -d $(RADDB_INSDIR) ] ;\ + -if [ ! -d $(RADDB_EXDIR) ] ;\ then \ - /bin/mkdir -p $(RADDB_INSDIR) ;\ + /bin/mkdir -p $(RADDB_EXDIR) ;\ fi $(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/authfile \ - $(RADDB_INSDIR)/authfile + $(RADDB_EXDIR)/authfile $(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/clients \ - $(RADDB_INSDIR)/clients + $(RADDB_EXDIR)/clients $(INSTALL) $(M) 755 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/conversion.pl \ - $(RADDB_INSDIR)/conversion.pl + $(RADDB_EXDIR)/conversion.pl $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/dictionary \ - $(RADDB_INSDIR)/dictionary + $(RADDB_EXDIR)/dictionary $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/engine.config \ - $(RADDB_INSDIR)/engine.config + $(RADDB_EXDIR)/engine.config $(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/users \ - $(RADDB_INSDIR)/users + $(RADDB_EXDIR)/users $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/vendors \ - $(RADDB_INSDIR)/vendors + $(RADDB_EXDIR)/vendors $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/xas.fsm \ - $(RADDB_INSDIR)/xas.fsm + $(RADDB_EXDIR)/xas.fsm -if [ ! -d $(RADACCT_INSDIR) ] ;\ then \ /bin/mkdir -p $(RADACCT_INSDIR) ;\ @ 1.4 log @Make this package build again. Fixes PR pkg/8891 by Damon Brodie. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Compile correct default for configuration directory path into binaries. @ text @d3 2 a4 2 --- Makefile.orig Sun Apr 25 01:43:46 1999 +++ Makefile Sun Apr 25 01:44:41 1999 d71 1 a71 2 +#DEFS = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) \ # end local defs additions d74 2 d81 13 a93 1 @@@@ -237,12 +238,12 @@@@ d112 1 a112 1 @@@@ -439,6 +440,8 @@@@ d121 1 a121 1 @@@@ -697,26 +700,26 @@@@ @ 1.2 log @Use "INSTALL_TARGET" instead of custom "do-install" target and make sure that installing the package second time will work. @ text @d3 3 a5 3 --- Makefile.orig Sun Apr 25 01:03:24 1999 +++ Makefile Sun Apr 25 01:08:39 1999 @@@@ -51,11 +51,11 @@@@ d17 2 a18 1 +RADDB_INSDIR = ${PREFIX}/share/examples/radius d23 1 a23 1 @@@@ -63,12 +63,12 @@@@ d39 12 a50 1 @@@@ -90,13 +90,13 @@@@ d66 1 a66 1 @@@@ -122,10 +122,10 @@@@ d80 1 a80 1 @@@@ -237,12 +237,12 @@@@ d99 1 a99 2 @@@@ -438,6 +438,8 @@@@ #INSTALL = /bin/install d102 2 a104 2 +CFLAGS+= ${MERIT} ${STUFF} d107 38 @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- Makefile.orig Sun Mar 21 19:50:53 1999 +++ Makefile Sun Mar 21 19:51:44 1999 d17 1 a17 1 +RADDB_INSDIR = /etc/raddb @ 1.1.1.1 log @Merit AAA RADIUS server @ text @@