Imported changes from downstream Debian packaging.

diff --git a/debian/compat b/debian/compat
index 00750ed..b8626c4 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-3
+4

diff --git a/debian/freeradius-iodbc.postinst b/debian/freeradius-iodbc.postinst
index f44cb4e..ba77575 100755 (executable)
--- a/debian/freeradius-iodbc.postinst
+++ b/debian/freeradius-iodbc.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-       if command -v invoke-rc.d >/dev/null 2>&1; then
+       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
                invoke-rc.d freeradius restart
        else
                /etc/init.d/freeradius restart

diff --git a/debian/freeradius-krb5.postinst b/debian/freeradius-krb5.postinst
index f44cb4e..ba77575 100755 (executable)
--- a/debian/freeradius-krb5.postinst
+++ b/debian/freeradius-krb5.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-       if command -v invoke-rc.d >/dev/null 2>&1; then
+       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
                invoke-rc.d freeradius restart
        else
                /etc/init.d/freeradius restart

diff --git a/debian/freeradius-ldap.postinst b/debian/freeradius-ldap.postinst
index f44cb4e..ba77575 100755 (executable)
--- a/debian/freeradius-ldap.postinst
+++ b/debian/freeradius-ldap.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-       if command -v invoke-rc.d >/dev/null 2>&1; then
+       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
                invoke-rc.d freeradius restart
        else
                /etc/init.d/freeradius restart

diff --git a/debian/freeradius-mysql.postinst b/debian/freeradius-mysql.postinst
index f44cb4e..ba77575 100755 (executable)
--- a/debian/freeradius-mysql.postinst
+++ b/debian/freeradius-mysql.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-       if command -v invoke-rc.d >/dev/null 2>&1; then
+       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
                invoke-rc.d freeradius restart
        else
                /etc/init.d/freeradius restart

diff --git a/debian/freeradius-postgresql.postinst b/debian/freeradius-postgresql.postinst
index f44cb4e..ba77575 100755 (executable)
--- a/debian/freeradius-postgresql.postinst
+++ b/debian/freeradius-postgresql.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-       if command -v invoke-rc.d >/dev/null 2>&1; then
+       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
                invoke-rc.d freeradius restart
        else
                /etc/init.d/freeradius restart

diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index ca16294..6c21475 100755 (executable)
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -4,16 +4,15 @@ set -e
 
 case "$1" in
   configure)
+       if ! id freerad >/dev/null 2>&1; then
+               addgroup --system freerad || true
+               groups freerad 2>/dev/null || adduser --system --no-create-home --home /etc/freeradius --ingroup freerad --disabled-password freerad
 
-       addgroup --system freerad || true
-       groups freerad 2>/dev/null || adduser --system --no-create-home --home /etc/freeradius --ingroup freerad --disabled-password freerad
+               # make sure there is a user and group 'freerad'
+               groups freerad |grep freerad >/dev/null
 
-       # make sure there is a user and group 'freerad'
-       groups freerad |grep freerad >/dev/null
-
-       if [ "$2" = "" ] ; then
                # put user freerad in group shadow, so the daemon can auth locally
-               usermod -G shadow freerad
+               adduser freerad shadow
        fi
 
        update-rc.d freeradius defaults 50 >/dev/null
@@ -34,29 +33,32 @@ case "$1" in
                mkdir /var/run/freeradius
        fi
 
-       chown freerad:freerad /var/run/freeradius
-
+       chown -R freerad:freerad /var/log/freeradius
+       chown -R freerad:freerad /var/run/freeradius
        find /etc/freeradius -type f -exec chgrp freerad {} \; -exec chmod 640 {} \;
        find /etc/freeradius -type d -exec chgrp freerad {} \; -exec chmod 2750 {} \;
-       find /var/log/freeradius -exec chown freerad {} \; -exec chgrp freerad {} \;
 
-       if [ "$2" = "" ] ; then
+       # Relax permissions on local dictionary - allows radclient to run
+       # and should not contain secrets.  At any rate, only do it on fresh
+       # install
+       if [ -z "$2" ]; then
+               chmod 0644 /etc/freeradius/dictionary
+               chmod 0751 /etc/freeradius/
                action="start"
        else
                action="restart"
        fi
 
-       if command -v invoke-rc.d >/dev/null 2>&1; then
+       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
                invoke-rc.d freeradius $action || true
        else
                /etc/init.d/freeradius $action
        fi
-
        ;;
   abort-upgrade)
        ;;
   abort-remove)
-       if command -v invoke-rc.d >/dev/null 2>&1; then
+       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
                invoke-rc.d freeradius start || true
        else
                /etc/init.d/freeradius start

diff --git a/debian/freeradius.postrm b/debian/freeradius.postrm
index e142f57..e94464e 100755 (executable)
--- a/debian/freeradius.postrm
+++ b/debian/freeradius.postrm
@@ -6,14 +6,12 @@ case "$1" in
        remove)
                ;;
        purge)
-               rm -f /etc/init.d/freeradius
                update-rc.d -f freeradius remove >/dev/null
-
-               if [ -d /var/log/freeradius ] 
+               if [ -d /var/log/freeradius ]
                then
                        rm -rf /var/log/freeradius
                fi
-               rm -rf /etc/freeradius
+               rmdir --ignore-fail-on-non-empty /etc/freeradius
                deluser freerad shadow || true
                deluser freerad || true
                delgroup freerad || true

diff --git a/debian/freeradius.prerm b/debian/freeradius.prerm
index fb23649..49d6125 100755 (executable)
--- a/debian/freeradius.prerm
+++ b/debian/freeradius.prerm
@@ -4,8 +4,8 @@ set -e
 
 case "$1" in
   remove)
-       if command -v invoke-rc.d >/dev/null 2>&1; then
-               invoke-rc.d freeradius stop || true
+       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+               invoke-rc.d freeradius stop
        else
                /etc/init.d/freeradius stop
        fi