network/freeradius-server: Updated for version 2.2.3.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 40 insertions, 14 deletions

diff --git a/network/freeradius-server/README b/network/freeradius-server/README
index 813a602bbb..a003ad68ee 100644
--- a/network/freeradius-server/README
+++ b/network/freeradius-server/README
@@ -6,3 +6,6 @@ Authentication and Accounting various types of network access.  To use the
 server, you also need a correctly setup client which will talk to it, 
 including terminal servers, Ethernet Switches, Wireless Access Points or a 
 PC with appropriate software which emulates it (PortSlave, radiusclient etc).
+
+See README.SLACKWARE (which is also installed with the package docs) for
+setup, configuration, and usage hints.
diff --git a/network/freeradius-server/README.SLACKWARE b/network/freeradius-server/README.SLACKWARE
new file mode 100644
index 0000000000..df3f47b87c
--- /dev/null
+++ b/network/freeradius-server/README.SLACKWARE
@@ -0,0 +1,17 @@
+It is strongly recommend that the radiusd server has as few permissions as
+possible. That is, if you're not using shadow passwords, the user and group
+should be set to radius. For example:
+
+  # groupadd -g 272 radius
+  # useradd -u 272 -d /dev/null -s /bin/false -g radius radius
+
+Don't forget to fix permissions:
+
+  # chown -R radius:radius /etc/raddb /var/run/radiusd /var/log/radius
+
+And, last but not least, uncomment user/group in /etc/raddb/radiusd.conf
+
+Although this script can build a feature (3.x) release successfully, it is
+probably much safer to use a stable (2.x) release for now. However, if you
+decide to try the new release out, make sure to read the documentation
+found in /etc/raddb/README.rst (Installed with a feature release only).
diff --git a/network/freeradius-server/doinst.sh b/network/freeradius-server/doinst.sh
index f1d6d8e529..64b05d0ad1 100644
--- a/network/freeradius-server/doinst.sh
+++ b/network/freeradius-server/doinst.sh
@@ -32,4 +32,5 @@ config etc/raddb/radiusd.conf.new
 config etc/raddb/sql.conf.new
 config etc/raddb/sqlippool.conf.new
 config etc/raddb/templates.conf.new
+config etc/raddb/users.new
 
diff --git a/network/freeradius-server/freeradius-server.SlackBuild b/network/freeradius-server/freeradius-server.SlackBuild
index a0c78b9a17..f7c7e0aaf8 100644
--- a/network/freeradius-server/freeradius-server.SlackBuild
+++ b/network/freeradius-server/freeradius-server.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for FreeRADIUS Server
 
-# Copyright 2010-2011, mario <mario@slackverse.org>
+# Copyright 2010, 2011, 2013  Mario Preksavec, Zagreb, HR
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,7 +11,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=freeradius-server
-VERSION=${VERSION:-2.1.12}
+VERSION=${VERSION:-2.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,10 +64,10 @@ tar jxvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -96,13 +96,18 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 install -D -m0644 -oroot -groot scripts/rc.radiusd $PKG/etc/rc.d/rc.radiusd.new
 
 # Append .new to config files
-for i in $PKG/etc/raddb/*.conf ; do mv $i $i.new ; done
+for i in $PKG/etc/raddb/{*.conf,users} ; do mv $i $i.new ; done
+
+# Remove useless rc.radiusd
+rm $PKG/usr/sbin/rc.radiusd
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# Perform greedy copy on INSTALL file to support feature release tree
 cp -a \
-  COPYRIGHT CREDITS INSTALL LICENSE README VERSION \
+  COPYRIGHT CREDITS INSTALL* LICENSE README.rst VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/freeradius-server/freeradius-server.info b/network/freeradius-server/freeradius-server.info
index 69399569d9..93574df7ab 100644
--- a/network/freeradius-server/freeradius-server.info
+++ b/network/freeradius-server/freeradius-server.info
@@ -1,10 +1,10 @@
 PRGNAM="freeradius-server"
-VERSION="2.1.12"
+VERSION="2.2.3"
 HOMEPAGE="http://www.freeradius.org/"
-DOWNLOAD="ftp://ftp.freeradius.org/pub/freeradius/old/freeradius-server-2.1.12.tar.bz2"
-MD5SUM="862d3a2c11011e61890ba84fa636ed8c"
+DOWNLOAD="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-2.2.3.tar.bz2"
+MD5SUM="25fb44cc1bc121f44f61f439bf45a420"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="mario"
-EMAIL="mario@slackverse.org"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"