+++ /dev/null
-diff -dur freeradius-1.0.1.orig/raddb/radiusd.conf.in freeradius-1.0.1/raddb/radiusd.conf.in
---- freeradius-1.0.1.orig/raddb/radiusd.conf.in 2004-10-13 11:29:16.000000000 +0200
-+++ freeradius-1.0.1/raddb/radiusd.conf.in 2004-10-13 11:49:08.318567276 +0200
-@@ -106,8 +106,8 @@
- # that the debugging mode server is running as a user that can read the
- # shadow info, and the user listed below can not.
- #
--#user = nobody
--#group = nobody
-+user = radius
-+group = radius
-
- # max_request_time: The maximum time (in seconds) to handle a request.
- #
+++ /dev/null
-diff -Nur freeradius-1.1.6.orig/src/modules/rlm_eap/libeap/Makefile freeradius-1.1.6.linking/src/modules/rlm_eap/libeap/Makefile
---- freeradius-1.1.6.orig/src/modules/rlm_eap/libeap/Makefile 2006-03-23 11:17:46.000000000 +0000
-+++ freeradius-1.1.6.linking/src/modules/rlm_eap/libeap/Makefile 2007-05-16 20:45:45.000000000 +0000
-@@ -29,7 +29,7 @@
- $(TARGET).la: $(LT_OBJS)
- $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
- $(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ \
-- $(top_builddir)/src/lib/libradius.la $(LIBS)
-+ $(top_builddir)/src/lib/libradius.la $(LIBS) $(OPENSSL_LIBS)
-
- $(LT_OBJS): $(INCLUDES)
-
+++ /dev/null
-diff -dur freeradius-1.0.1.orig/Makefile freeradius-1.0.1/Makefile
---- freeradius-1.0.1.orig/Makefile 2004-06-09 19:31:11.000000000 +0200
-+++ freeradius-1.0.1/Makefile 2004-09-30 14:57:42.084560009 +0200
-@@ -11,7 +11,7 @@
-
- .PHONY: all clean install
-
--SUBDIRS = $(LTDL_SUBDIRS) src raddb scripts doc
-+SUBDIRS = src raddb scripts doc
- WHAT_TO_MAKE = all
-
- all:
+++ /dev/null
-Only in freeradius-1.0.1.orig: acinclude.m4
-diff -dur freeradius-1.0.1.orig/raddb/radiusd.conf.in freeradius-1.0.1/raddb/radiusd.conf.in
---- freeradius-1.0.1.orig/raddb/radiusd.conf.in 2004-05-13 22:10:19.000000000 +0200
-+++ freeradius-1.0.1/raddb/radiusd.conf.in 2004-10-13 10:15:34.997729127 +0200
-@@ -71,7 +71,7 @@
- # make
- # make install
- #
--libdir = @libdir@
-+libdir = @libdir@/freeradius
-
- # pidfile: Where to place the PID of the RADIUS server.
- #
-diff -dur freeradius-1.0.1.orig/src/main/mainconfig.c freeradius-1.0.1/src/main/mainconfig.c
---- freeradius-1.0.1.orig/src/main/mainconfig.c 2004-06-08 17:09:40.000000000 +0200
-+++ freeradius-1.0.1/src/main/mainconfig.c 2004-10-13 10:15:35.010728454 +0200
-@@ -103,7 +103,7 @@
- { "prefix", PW_TYPE_STRING_PTR, 0, &prefix, "/usr/local"},
- { "localstatedir", PW_TYPE_STRING_PTR, 0, &localstatedir, "${prefix}/var"},
- { "logdir", PW_TYPE_STRING_PTR, 0, &radlog_dir, "${localstatedir}/log"},
-- { "libdir", PW_TYPE_STRING_PTR, 0, &radlib_dir, "${prefix}/lib"},
-+ { "libdir", PW_TYPE_STRING_PTR, 0, &radlib_dir, "${prefix}/lib/freeradius"},
- { "radacctdir", PW_TYPE_STRING_PTR, 0, &radacct_dir, "${logdir}/radacct" },
- { "hostname_lookups", PW_TYPE_BOOLEAN, 0, &librad_dodns, "no" },
- #ifdef WITH_SNMP
-diff -dur freeradius-1.0.1.orig/src/modules/rlm_sql/drivers/rules.mak freeradius-1.0.1/src/modules/rlm_sql/drivers/rules.mak
---- freeradius-1.0.1.orig/src/modules/rlm_sql/drivers/rules.mak 2003-06-05 22:16:54.000000000 +0200
-+++ freeradius-1.0.1/src/modules/rlm_sql/drivers/rules.mak 2004-10-13 10:17:24.451056585 +0200
-@@ -93,7 +93,7 @@
- $(TARGET).la: $(LT_OBJS)
- $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
- -module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
-- -rpath $(libdir) $^ $(RLM_SQL_LIBS)
-+ -rpath $(libdir)/freeradius $^ $(RLM_SQL_LIBS)
-
- #######################################################################
- #
-@@ -143,7 +143,7 @@
- # Do any module-specific installation.
- #
- # If there isn't a TARGET defined, then don't do anything.
--# Otherwise, install the libraries into $(libdir)
-+# Otherwise, install the libraries into $(libdir)/freeradius
- #
- install:
-- [ "x$(TARGET)" = "x" ] || $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(R)$(libdir)/$(TARGET).la
-+ [ "x$(TARGET)" = "x" ] || $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la
-diff -dur freeradius-1.0.1.orig/src/modules/rules.mak freeradius-1.0.1/src/modules/rules.mak
---- freeradius-1.0.1.orig/src/modules/rules.mak 2002-08-06 18:11:39.000000000 +0200
-+++ freeradius-1.0.1/src/modules/rules.mak 2004-10-13 10:16:28.824939523 +0200
-@@ -113,7 +113,7 @@
- $(TARGET).la: $(LT_OBJS)
- $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
- -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \
-- -rpath $(libdir) $^ $(top_builddir)/src/lib/libradius.la \
-+ -rpath $(libdir)/freeradius $^ $(top_builddir)/src/lib/libradius.la \
- $(RLM_LIBS) $(LIBS)
-
- #######################################################################
-@@ -155,13 +155,13 @@
- # Do any module-specific installation.
- #
- # If there isn't a TARGET defined, then don't do anything.
--# Otherwise, install the libraries into $(libdir)
-+# Otherwise, install the libraries into $(libdir)/freeradius
- #
- install:
- @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
- if [ "x$(TARGET)" != "x" ]; then \
- $(LIBTOOL) --mode=install $(INSTALL) -c \
-- $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
-- rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
-- ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
-+ $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \
-+ rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
-+ ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
- fi
+++ /dev/null
-diff -dur freeradius-1.0.1.orig/Make.inc.in freeradius-1.0.1/Make.inc.in
---- freeradius-1.0.1.orig/Make.inc.in 2004-01-23 18:08:43.000000000 +0100
-+++ freeradius-1.0.1/Make.inc.in 2004-10-13 11:08:27.041360959 +0200
-@@ -45,7 +45,7 @@
-
- LOGDIR = ${logdir}
- RADDBDIR = ${raddbdir}
--RUNDIR = ${localstatedir}/run/radiusd
-+RUNDIR = ${localstatedir}/run/freeradius
- SBINDIR = ${sbindir}
- RADIR = ${radacctdir}
-
-diff -dur freeradius-1.0.1.orig/raddb/radiusd.conf.in freeradius-1.0.1/raddb/radiusd.conf.in
---- freeradius-1.0.1.orig/raddb/radiusd.conf.in 2004-10-13 11:03:48.000000000 +0200
-+++ freeradius-1.0.1/raddb/radiusd.conf.in 2004-10-13 11:09:32.696958268 +0200
-@@ -31,7 +31,7 @@
-
- # Location of config and logfiles.
- confdir = ${raddbdir}
--run_dir = ${localstatedir}/run/radiusd
-+run_dir = ${localstatedir}/run/freeradius
-
- #
- # The logging messages for the server are appended to the
+++ /dev/null
-#!/bin/sh
-#
-# chkconfig: 345 88 12
-# description: Start/Stop the RADIUS server daemon
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Copyright (C) 2001 The FreeRADIUS Project http://www.freeradius.org
-#
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-[ -f /etc/raddb/radiusd.conf ] || exit 0
-
-start() {
- # Check if the service is already running?
- if [ ! -f /var/lock/subsys/freeradius ]; then
- msg_starting RADIUS
- daemon /usr/sbin/radiusd
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/freeradius
- else
- msg_already_running RADIUS
- fi
-}
-
-stop() {
- # Stop daemons.
- if [ -f /var/lock/subsys/freeradius ]; then
- msg_stopping RADIUS
- killproc /usr/sbin/radiusd
- rm -f /var/lock/subsys/freeradius > /dev/null 2>&1
- else
- msg_not_running RADIUS
- fi
-}
-
-condrestart() {
- if [ -f /var/lock/subsys/freeradius ]; then
- stop
- sleep 3
- start
- else
- msg_not_running RADIUS
- RETVAL=$1
- fi
-}
-
-RETVAL=0
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- sleep 3
- start
- ;;
- try-restart)
- condrestart 0
- ;;
- reload|force-reload)
- if [ -f /var/lock/subsys/freeradius ]; then
- msg_reloading RADIUS
- killproc /usr/sbin/radiusd -HUP
- RETVAL=$?
- else
- msg_not_running RADIUS
- exit 7
- fi
- ;;
- status)
- status radiusd
- exit $?
- ;;
- *)
- msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
- exit 3
-esac
-
-exit $RETVAL
+++ /dev/null
-# You can use this to rotate the /var/log/freeradius/* files, simply copy
-# it to /etc/logrotate.d/radiusd
-
-# Last part should reload the server
-
-/var/log/freeradius/radacct/*/detail {
- olddir /var/log/archive/freeradius/radacct
- monthly
- rotate 4
- create 660 root radius
- missingok
- compress
-}
-
-/var/log/freeradius/checkrad.log {
- olddir /var/log/archive/freeradius
- monthly
- rotate 4
- create 660 root radius
- missingok
- compress
-}
-
-/var/log/freeradius/radius.log {
- olddir /var/log/archive/freeradius
- monthly
- rotate 4
- create 660 root radius
- missingok
- compress
-}
-
-/var/log/freeradius/radwatch.log {
- olddir /var/log/archive/freeradius
- monthly
- rotate 4
- create 660 root radius
- missingok
- compress
-}
-
-
-
-# Should this really be rotated
-/var/log/freeradius/radutmp {
- olddir /var/log/archive/freeradius
- monthly
- rotate 4
- create 660 root radius
- compress
- missingok
-}
-
-/var/log/freeradius/radwtmp {
- olddir /var/log/archive/freeradius
- monthly
- rotate 4
- create 660 root radius
- compress
- missingok
- postrotate
- /sbin/service radiusd condrestart
- endscript
-}
+++ /dev/null
-#%PAM-1.0
-auth include system-auth
-account required pam_nologin.so
-account include system-auth