# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1298070297 -3600
# Node ID cc6a45887422cff1d8b21623a8a3e077071c27bb
# Parent  b6aedb07bed73d5b930d221f5a223cbe3f52c640
Resynchronize with current vendor original spec.
Remove patched SUN_LEN replacement, taken over by author.

diff -r b6aedb07bed7 -r cc6a45887422 freeradius/freeradius.patch
--- a/freeradius/freeradius.patch	Wed Feb 16 18:17:11 2011 +0100
+++ b/freeradius/freeradius.patch	Sat Feb 19 00:04:57 2011 +0100
@@ -1,6 +1,6 @@
 Index: Make.inc.in
---- Make.inc.in.orig	2008-09-25 10:41:26 +0200
-+++ Make.inc.in	2008-09-25 17:56:09 +0200
+--- Make.inc.in.orig	2010-05-24 07:40:58.000000000 +0200
++++ Make.inc.in	2010-05-24 23:54:11.000000000 +0200
 @@ -15,7 +15,7 @@
  docdir		= @docdir@
  mandir		= @mandir@
@@ -10,7 +10,7 @@
  logdir		= @logdir@
  includedir	= @includedir@
  raddbdir	= @raddbdir@
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@
  
  LOGDIR		= ${logdir}
  RADDBDIR	= ${raddbdir}
@@ -20,51 +20,27 @@
  RADIR		= ${radacctdir}
  LIBRADIUS	= $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
 Index: raddb/radiusd.conf.in
---- raddb/radiusd.conf.in.orig	2008-09-25 10:41:26 +0200
-+++ raddb/radiusd.conf.in	2008-09-25 17:56:09 +0200
+--- raddb/radiusd.conf.in.orig	2010-05-24 07:40:58.000000000 +0200
++++ raddb/radiusd.conf.in	2010-05-24 23:54:11.000000000 +0200
 @@ -66,7 +66,7 @@
  
  #  Location of config and logfiles.
  confdir = ${raddbdir}
--run_dir = ${localstatedir}/run/radiusd
+-run_dir = ${localstatedir}/run/${name}
 +run_dir = ${localstatedir}
  
  # Should likely be ${localstatedir}/lib/radiusd
  db_dir = ${raddbdir}
-Index: src/modules/rlm_sql/drivers/Makefile.in
---- 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 @@
+Index: src/main/event.c
+--- src/main/event.c.orig	2010-05-24 07:40:58.000000000 +0200
++++ src/main/event.c	2010-05-25 08:53:57.000000000 +0200
+@@ -74,7 +74,9 @@
+ #define PTHREAD_MUTEX_LOCK if (have_children) pthread_mutex_lock
+ #define PTHREAD_MUTEX_UNLOCK if (have_children) pthread_mutex_unlock
  
- 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
-Index: src/main/command.c
---- src/main/command.c.orig	2009-01-08 19:39:52.565611820 +0100
-+++ src/main/command.c	2009-01-08 19:40:18.333372190 +0100
-@@ -148,7 +148,7 @@
-         salocal.sun_family = AF_UNIX;
- 	memcpy(salocal.sun_path, path, len + 1); /* SUN_LEN does strlen */
- 	
--	socklen = SUN_LEN(&salocal);
-+	socklen = sizeof(salocal) - sizeof(salocal.sun_path) + strlen(salocal.sun_path);
- 
- 	/*
- 	 *	Check the path.
-Index: src/main/radmin.c
---- src/main/radmin.c.orig	2009-01-08 19:36:15.333428110 +0100
-+++ src/main/radmin.c	2009-01-08 19:39:15.131776575 +0100
-@@ -112,7 +112,7 @@
-         saremote.sun_family = AF_UNIX;
- 	memcpy(saremote.sun_path, path, len + 1); /* SUN_LEN does strlen */
- 	
--	socklen = SUN_LEN(&saremote);
-+	socklen = sizeof(saremote) - sizeof(saremote.sun_path) + strlen(saremote.sun_path);
- 
-         if (connect(sockfd, (struct sockaddr *)&saremote, socklen) < 0) {
- 		fprintf(stderr, "%s: Failed connecting to %s: %s\n",
++#if defined(HAVE_PTHREAD_H)
+ static pthread_t NO_SUCH_CHILD_PID;
++#endif
+ #else
+ /*
+  *	This is easier than ifdef's throughout the code.
diff -r b6aedb07bed7 -r cc6a45887422 freeradius/freeradius.spec
--- a/freeradius/freeradius.spec	Wed Feb 16 18:17:11 2011 +0100
+++ b/freeradius/freeradius.spec	Sat Feb 19 00:04:57 2011 +0100
@@ -1,6 +1,6 @@
 ##
 ##  freeradius.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -34,8 +34,8 @@
 Class:        EVAL
 Group:        RADIUS
 License:      GPL
-Version:      2.1.3
-Release:      20090106
+Version:      2.1.10
+Release:      20100929
 
 #   package options
 %option       with_mysql     no
@@ -49,10 +49,8 @@
 Patch0:       freeradius.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc, libtool
-PreReq:       OpenPKG, openpkg >= 20060823
+BuildPreReq:  OpenPKG, openpkg >= 20100101, make, gcc, libtool
+PreReq:       OpenPKG, openpkg >= 20100101
 BuildPreReq:  perl, openssl, gdbm, readline
 PreReq:       perl, openssl, gdbm, readline
 %if "%{with_mysql}" == "yes"
@@ -71,8 +69,6 @@
 BuildPreReq:  snmp
 PreReq:       snmp
 %endif
-AutoReq:      no
-AutoReqProv:  no
 
 %description
     FreeRADIUS is one of the most modular and featureful RADIUS servers
@@ -119,7 +115,7 @@
         --with-logdir=%{l_prefix}/var/freeradius \
         --with-radacctdir=%{l_prefix}/var/freeradius \
         --with-raddbdir=%{l_prefix}/etc/freeradius \
-        --without-threads \
+        --with-threads \
         --with-openssl-includes=%{l_prefix}/include/openssl \
         --with-openssl-libraries=%{l_prefix}/lib/ \
         --with-rlm_perl \
@@ -179,7 +175,6 @@
 
 %install
     #   install package
-    rm -rf $RPM_BUILD_ROOT
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/lib/freeradius
     %{l_make} %{l_mflags} install \
@@ -215,5 +210,4 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT