head	1.13;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.9
	OPENPKG_E1_MP:1.9
	OPENPKG_E1_MP_2_STABLE:1.9.2.2
	OPENPKG_E1_FP:1.9.2.2
	OPENPKG_2_STABLE_MP:1.9
	OPENPKG_2_STABLE_20061018:1.9.2.2
	OPENPKG_2_STABLE:1.9.0.2
	OPENPKG_CW_FP:1.4;
locks; strict;
comment	@# @;


1.13
date	2009.03.11.19.57.52;	author rse;	state Exp;
branches;
next	1.12;
commitid	06PiQ8TQr0lzwEFt;

1.12
date	2008.12.06.14.51.47;	author rse;	state Exp;
branches;
next	1.11;
commitid	ezrivo2gpLdTSptt;

1.11
date	2008.06.08.08.08.09;	author rse;	state Exp;
branches;
next	1.10;
commitid	dQVWqspow0O7t76t;

1.10
date	2008.04.04.18.41.46;	author rse;	state Exp;
branches;
next	1.9;
commitid	WQhMIbNHrPy24PXs;

1.9
date	2006.05.29.06.33.51;	author rse;	state Exp;
branches
	1.9.2.1;
next	1.8;
commitid	D8VpcEyCj6dwLSyr;

1.8
date	2006.03.21.10.34.01;	author rse;	state Exp;
branches;
next	1.7;
commitid	R62wHt73jp3qj2qr;

1.7
date	2005.10.06.12.05.05;	author steve;	state Exp;
branches;
next	1.6;

1.6
date	2005.06.25.18.58.25;	author rse;	state Exp;
branches;
next	1.5;

1.5
date	2005.06.04.07.04.39;	author rse;	state Exp;
branches;
next	1.4;

1.4
date	2005.02.17.18.20.23;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2004.08.10.08.29.51;	author tho;	state Exp;
branches;
next	1.2;

1.2
date	2004.07.23.20.43.03;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2004.07.22.22.32.39;	author thl;	state Exp;
branches;
next	;

1.9.2.1
date	2006.05.29.06.33.51;	author rse;	state dead;
branches;
next	1.9.2.2;
commitid	iZxwRSmmWscPXUQr;

1.9.2.2
date	2006.10.16.14.50.06;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.13
log
@upgrading package: freeradius 2.1.3 -> 2.1.4
@
text
@Index: Make.inc.in
--- Make.inc.in.orig	2009-03-11 03:26:50 +0100
+++ Make.inc.in	2009-03-11 20:42:51 +0100
@@@@ -15,7 +15,7 @@@@
 docdir		= @@docdir@@
 mandir		= @@mandir@@
 datadir		= @@datadir@@
-dictdir		= $(datadir)/freeradius
+dictdir		= $(datadir)
 logdir		= @@logdir@@
 includedir	= @@includedir@@
 raddbdir	= @@raddbdir@@
@@@@ -48,7 +48,7 @@@@
 
 LOGDIR		= ${logdir}
 RADDBDIR	= ${raddbdir}
-RUNDIR		= ${localstatedir}/run/radiusd
+RUNDIR		= ${localstatedir}
 SBINDIR		= ${sbindir}
 RADIR		= ${radacctdir}
 LIBRADIUS	= $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
Index: raddb/radiusd.conf.in
--- raddb/radiusd.conf.in.orig	2009-03-11 03:26:50 +0100
+++ raddb/radiusd.conf.in	2009-03-11 20:42:51 +0100
@@@@ -66,7 +66,7 @@@@
 
 #  Location of config and logfiles.
 confdir = ${raddbdir}
-run_dir = ${localstatedir}/run/${name}
+run_dir = ${localstatedir}
 
 # Should likely be ${localstatedir}/lib/radiusd
 db_dir = ${raddbdir}
Index: src/main/event.c
--- src/main/event.c.orig	2009-03-11 03:26:50 +0100
+++ src/main/event.c	2009-03-11 20:50:59 +0100
@@@@ -1628,7 +1628,9 @@@@
 	 */
 	request->num_proxied_requests = 1;
 	request->num_proxied_responses = 0;
+#if defined(HAVE_PTHREAD_H)
 	request->child_pid = NO_SUCH_CHILD_PID;
+#endif
 
 	update_event_timestamp(request->proxy, request->proxy_when.tv_sec);
 
Index: src/modules/rlm_sql/drivers/Makefile.in
--- src/modules/rlm_sql/drivers/Makefile.in.orig	2009-03-11 03:26:50 +0100
+++ src/modules/rlm_sql/drivers/Makefile.in	2009-03-11 20:42:51 +0100
@@@@ -15,7 +15,7 @@@@
 
 common:
 	@@[ -d lib/ ] || mkdir lib
-	@@for mod in $(SQL_MODULES); do \
+	@@for mod in $(SQL_MODULES) NOOP; do \
 		echo "Making $(WHAT_TO_MAKE) in $$mod..."; \
-		$(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \
+		[ -d $$mod ] || exit 0; $(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \
 	done
@


1.12
log
@upgrading package: freeradius 2.0.5 -> 2.1.3
@
text
@d2 2
a3 2
--- Make.inc.in.orig	2008-09-25 10:41:26 +0200
+++ Make.inc.in	2008-09-25 17:56:09 +0200
d23 2
a24 2
--- raddb/radiusd.conf.in.orig	2008-09-25 10:41:26 +0200
+++ raddb/radiusd.conf.in	2008-09-25 17:56:09 +0200
d29 1
a29 1
-run_dir = ${localstatedir}/run/radiusd
d34 13
d48 3
a50 3
--- src/modules/rlm_sql/drivers/Makefile.in.orig	2008-09-25 10:41:26 +0200
+++ src/modules/rlm_sql/drivers/Makefile.in	2008-09-25 17:56:09 +0200
@@@@ -16,7 +16,7 @@@@
@


1.11
log
@upgrading package: freeradius 2.0.4 -> 2.0.5
@
text
@d2 2
a3 2
--- Make.inc.in.orig	2008-06-05 14:38:12 +0200
+++ Make.inc.in	2008-06-08 09:59:39 +0200
d23 3
a25 3
--- raddb/radiusd.conf.in.orig	2008-05-30 11:18:43 +0200
+++ raddb/radiusd.conf.in	2008-06-08 09:59:39 +0200
@@@@ -62,7 +62,7 @@@@
d33 1
a33 23
 db_dir = $(raddbdir)
Index: src/main/event.c
--- src/main/event.c.orig	2008-06-06 15:10:27 +0200
+++ src/main/event.c	2008-06-08 10:04:40 +0200
@@@@ -982,7 +982,7 @@@@
 			break;
 		}
 
-#if defined(HAVE_PTHREAD_H) || defined(WITH_PROXY)
+#if defined(HAVE_PTHREAD_H)
 		/*
 		 *	A child thread MAY still be running on the
 		 *	request.  Ask the thread to stop working on
@@@@ -2532,6 +2532,9 @@@@
 	rad_listen_t *listener = ctx;
 	RAD_REQUEST_FUNP fun;
 	REQUEST *request;
+#if !defined(HAVE_PTHREAD_H) && defined(WNOHANG)
+    int argval;
+#endif
 
 	rad_assert(xel == el);
 
d35 2
a36 2
--- src/modules/rlm_sql/drivers/Makefile.in.orig	2006-07-06 18:54:27 +0200
+++ src/modules/rlm_sql/drivers/Makefile.in	2008-06-08 09:59:39 +0200
@


1.10
log
@upgrading package: freeradius 1.1.7 -> 2.0.3
@
text
@d2 2
a3 2
--- Make.inc.in.orig	2007-11-24 09:28:43 +0100
+++ Make.inc.in	2008-04-04 18:45:54 +0200
d23 2
a24 2
--- raddb/radiusd.conf.in.orig	2008-03-04 17:53:02 +0100
+++ raddb/radiusd.conf.in	2008-04-04 18:45:54 +0200
d35 12
a46 3
--- src/main/event.c.orig	2008-03-15 13:04:28 +0100
+++ src/main/event.c	2008-04-04 20:06:14 +0200
@@@@ -2284,6 +2284,9 @@@@
d58 1
a58 1
+++ src/modules/rlm_sql/drivers/Makefile.in	2008-04-04 18:45:54 +0200
@


1.9
log
@upgrading package: freeradius 1.1.1 -> 1.1.2
@
text
@d2 4
a5 4
--- Make.inc.in.orig	2006-01-24 22:02:20 +0100
+++ Make.inc.in	2006-05-29 08:26:38 +0200
@@@@ -14,7 +14,7 @@@@
 sbindir		= @@sbindir@@
d11 1
d13 1
a13 2
 radacctdir	= @@radacctdir@@
@@@@ -46,7 +46,7 @@@@
d21 1
a21 1
 
d23 3
a25 3
--- raddb/radiusd.conf.in.orig	2006-04-20 20:40:29 +0200
+++ raddb/radiusd.conf.in	2006-05-29 08:26:38 +0200
@@@@ -31,7 +31,7 @@@@
d32 15
a46 2
 #
 #  The logging messages for the server are appended to the
d48 3
a50 3
--- src/modules/rlm_sql/drivers/Makefile.in.orig	2006-05-25 18:24:42 +0200
+++ src/modules/rlm_sql/drivers/Makefile.in	2006-05-29 08:29:22 +0200
@@@@ -13,7 +13,7 @@@@
@


1.9.2.1
log
@file freeradius.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:50:06 +0000
@
text
@d1 46
@


1.9.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 46
Index: Make.inc.in
--- Make.inc.in.orig	2006-01-24 22:02:20 +0100
+++ Make.inc.in	2006-05-29 08:26:38 +0200
@@@@ -14,7 +14,7 @@@@
 sbindir		= @@sbindir@@
 mandir		= @@mandir@@
 datadir		= @@datadir@@
-dictdir		= $(datadir)/freeradius
+dictdir		= $(datadir)
 logdir		= @@logdir@@
 raddbdir	= @@raddbdir@@
 radacctdir	= @@radacctdir@@
@@@@ -46,7 +46,7 @@@@
 
 LOGDIR		= ${logdir}
 RADDBDIR	= ${raddbdir}
-RUNDIR		= ${localstatedir}/run/radiusd
+RUNDIR		= ${localstatedir}
 SBINDIR		= ${sbindir}
 RADIR		= ${radacctdir}
 
Index: raddb/radiusd.conf.in
--- raddb/radiusd.conf.in.orig	2006-04-20 20:40:29 +0200
+++ raddb/radiusd.conf.in	2006-05-29 08:26:38 +0200
@@@@ -31,7 +31,7 @@@@
 
 #  Location of config and logfiles.
 confdir = ${raddbdir}
-run_dir = ${localstatedir}/run/radiusd
+run_dir = ${localstatedir}
 
 #
 #  The logging messages for the server are appended to the
Index: src/modules/rlm_sql/drivers/Makefile.in
--- src/modules/rlm_sql/drivers/Makefile.in.orig	2006-05-25 18:24:42 +0200
+++ src/modules/rlm_sql/drivers/Makefile.in	2006-05-29 08:29:22 +0200
@@@@ -13,7 +13,7 @@@@
 
 common:
 	@@[ -d lib/ ] || mkdir lib
-	@@for mod in $(SQL_MODULES); do \
+	@@for mod in $(SQL_MODULES) NOOP; do \
 		echo "Making $(WHAT_TO_MAKE) in $$mod..."; \
-		$(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \
+		[ -d $$mod ] || exit 0; $(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \
 	done
@


1.8
log
@upgrading package: freeradius 1.0.5 -> 1.1.1
@
text
@d3 1
a3 1
+++ Make.inc.in	2006-03-21 09:27:22 +0100
d23 2
a24 2
--- raddb/radiusd.conf.in.orig	2006-02-10 16:12:02 +0100
+++ raddb/radiusd.conf.in	2006-03-21 09:27:22 +0100
d35 3
a37 3
--- src/modules/rlm_sql/drivers/Makefile.in.orig	2006-02-10 20:47:19 +0100
+++ src/modules/rlm_sql/drivers/Makefile.in	2006-03-21 09:39:59 +0100
@@@@ -13,8 +13,8 @@@@
d43 3
a45 4
 		what=$(WHAT_TO_MAKE); \
 		echo "Making $$what in $$mod..."; \
-		(cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit $?;\
+		[ -d $$mod ] || exit 0; (cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit $?;\
@


1.7
log
@upgrading package: freeradius 1.0.4 -> 1.0.5
@
text
@d2 2
a3 2
--- Make.inc.in.orig	2004-01-23 18:08:43 +0100
+++ Make.inc.in	2005-10-05 23:17:12 +0200
d13 1
a13 1
@@@@ -45,7 +45,7 @@@@
d23 2
a24 2
--- raddb/radiusd.conf.in.orig	2005-06-12 00:20:40 +0200
+++ raddb/radiusd.conf.in	2005-10-05 23:17:12 +0200
a33 11
Index: src/modules/rlm_ldap/rlm_ldap.c
--- src/modules/rlm_ldap/rlm_ldap.c.orig	2005-08-29 18:09:56 +0200
+++ src/modules/rlm_ldap/rlm_ldap.c	2005-10-05 23:17:12 +0200
@@@@ -193,6 +193,7 @@@@
  *      every use of the pthread functions.
  */
 #define pthread_mutex_lock(a)
+#define pthread_mutex_trylock(a) 0
 #define pthread_mutex_unlock(a)
 #define pthread_mutex_init(a,b)
 #define pthread_mutex_destroy(a)
d35 3
a37 3
--- src/modules/rlm_sql/drivers/Makefile.in.orig	2005-04-11 23:18:28 +0200
+++ src/modules/rlm_sql/drivers/Makefile.in	2005-10-05 23:17:12 +0200
@@@@ -18,10 +18,10 @@@@
d39 1
a39 1
 common: 
a43 1
 		[ "$$what" = "all" ] && what="$(TARGET_LIBS)"; \
a47 1
 
@


1.6
log
@upgrading package: freeradius 1.0.3 -> 1.0.4
@
text
@d3 1
a3 1
+++ Make.inc.in	2005-06-25 20:53:37 +0200
d24 1
a24 1
+++ raddb/radiusd.conf.in	2005-06-25 20:53:37 +0200
d35 2
a36 2
--- src/modules/rlm_ldap/rlm_ldap.c.orig	2005-02-07 20:51:28 +0100
+++ src/modules/rlm_ldap/rlm_ldap.c	2005-06-25 20:53:37 +0200
d47 1
a47 1
+++ src/modules/rlm_sql/drivers/Makefile.in	2005-06-25 20:53:37 +0200
@


1.5
log
@upgrading package: freeradius 1.0.2 -> 1.0.3
@
text
@d3 1
a3 1
+++ Make.inc.in	2005-06-04 08:54:23 +0200
d23 2
a24 2
--- raddb/radiusd.conf.in.orig	2005-02-07 20:52:05 +0100
+++ raddb/radiusd.conf.in	2005-06-04 08:54:23 +0200
d36 1
a36 1
+++ src/modules/rlm_ldap/rlm_ldap.c	2005-06-04 08:54:23 +0200
d47 1
a47 1
+++ src/modules/rlm_sql/drivers/Makefile.in	2005-06-04 08:55:07 +0200
a60 12
Index: src/main/Makefile.in
--- src/main/Makefile.in.orig	2005-05-13 00:22:26 +0200
+++ src/main/Makefile.in	2005-06-04 09:02:35 +0200
@@@@ -146,7 +146,7 @@@@
 install:
 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radiusd$(EXEEXT)	$(R)$(sbindir)
 	$(INSTALL) -m 755 $(INSTALLSTRIP) radwho$(EXEEXT)	$(R)$(bindir)
-	$(INSTALL) -m 755 $(INSTALLSTRIP) radzap	$(R)$(bindir)
+	$(INSTALL) -m 755    radzap	$(R)$(bindir)
 	$(INSTALL) -m 755    radlast			$(R)$(bindir)
 	$(INSTALL) -m 755    radclient$(EXEEXT)		$(R)$(bindir)
 	$(INSTALL) -m 755    radrelay$(EXEEXT)		$(R)$(bindir)
@


1.4
log
@upgrading package: freeradius 1.0.1 -> 1.0.2
@
text
@d3 1
a3 1
+++ Make.inc.in	2005-02-17 19:08:46 +0100
d24 1
a24 1
+++ raddb/radiusd.conf.in	2005-02-17 19:08:46 +0100
d36 1
a36 1
+++ src/modules/rlm_ldap/rlm_ldap.c	2005-02-17 19:08:46 +0100
d46 2
a47 2
--- src/modules/rlm_sql/drivers/Makefile.in.orig	2003-10-09 06:00:26 +0200
+++ src/modules/rlm_sql/drivers/Makefile.in	2005-02-17 19:08:46 +0100
d57 2
a58 2
-		(cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit 1;\
+		[ -d $$mod ] || exit 0; (cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit 1;\
d61 12
@


1.3
log
@upgrading package: freeradius 1.0.0pre3 -> 1.0.0
@
text
@a0 50
Index: src/modules/rlm_x99_token/x99_rlm.c
--- src/modules/rlm_x99_token/x99_rlm.c.orig	2004-02-26 20:04:37 +0100
+++ src/modules/rlm_x99_token/x99_rlm.c	2004-07-22 21:47:04 +0200
@@@@ -517,8 +517,8 @@@@
 	    }
 
 	    /* Fast path if we didn't protect the state. */
-	    if (!(user_info.card_id & X99_CF_AM))
-		goto good_state;
+	    if ((user_info.card_id & X99_CF_AM))
+		{ /* defeat gcc "label at end of compound statement" error */
 
 	    /* Verify the state. */
 	    (void) memset(challenge, 0, sizeof(challenge));
@@@@ -544,7 +544,7 @@@@
 			"auth: bad state for [%s]: expired", username);
 		return RLM_MODULE_REJECT;
 	    }
-good_state:
+        }
 	    /* State is good! */
 
 	} else {
Index: src/modules/rlm_ldap/rlm_ldap.c
--- src/modules/rlm_ldap/rlm_ldap.c.orig	2004-04-30 09:54:56 +0200
+++ src/modules/rlm_ldap/rlm_ldap.c	2004-07-22 23:12:09 +0200
@@@@ -193,6 +193,7 @@@@
  *      every use of the pthread functions.
  */
 #define pthread_mutex_lock(a)
+#define pthread_mutex_trylock(a) 0
 #define pthread_mutex_unlock(a)
 #define pthread_mutex_init(a,b)
 #define pthread_mutex_destroy(a)
Index: src/modules/rlm_sql/drivers/Makefile.in
--- src/modules/rlm_sql/drivers/Makefile.in.orig	2003-10-09 06:00:26.000000000 +0200
+++ src/modules/rlm_sql/drivers/Makefile.in	2004-07-23 00:20:38.766269000 +0200
@@@@ -18,10 +18,10 @@@@
 
 common: 
 	@@[ -d lib/ ] || mkdir lib
-	@@for mod in $(SQL_MODULES); do \
+	@@for mod in $(SQL_MODULES) NOOP; do \
 		what=$(WHAT_TO_MAKE); \
 		[ "$$what" = "all" ] && what="$(TARGET_LIBS)"; \
 		echo "Making $$what in $$mod..."; \
-		(cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit 1;\
+		[ -d $$mod ] || exit 0; (cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit 1;\
 	done
 
d3 1
a3 1
+++ Make.inc.in	2004-07-23 22:29:36 +0200
d23 2
a24 2
--- raddb/radiusd.conf.in.orig	2004-05-13 22:10:19 +0200
+++ raddb/radiusd.conf.in	2004-07-23 22:35:48 +0200
d34 27
@


1.2
log
@more work on this new package
@
text
@a23 19
Index: src/main/radiusd.c
--- src/main/radiusd.c.orig	2004-05-28 16:42:27 +0200
+++ src/main/radiusd.c	2004-07-22 21:57:29 +0200
@@@@ -1443,6 +1443,7 @@@@
 			 *	doing something with it.
 			 */
 			if (spawn_flag) {
+#ifdef HAVE_PTHREAD_H
 				if (!thread_pool_addrequest(request, fun)) {
 					/*
 					 *	FIXME: Maybe just drop
@@@@ -1451,6 +1452,7 @@@@
 					request_reject(request);
 					request->finished = TRUE;
 				}
+#endif
 			} else {
 				rad_respond(request, fun);
 			}
@


1.1
log
@new package: freeradius 1.0.0pre3 (FreeRADIUS Server)
@
text
@d70 33
@