Manually merged updates from the old debian branch

diff --git a/debian/control b/debian/control
index 3b3e786..cb4fb4f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,8 @@ Build-Depends: debhelper (>= 9),
  libykclient-dev,
  libmemcached-dev,
  libhiredis-dev,
+ moonshot-trust-router-dev (>= 1.3),
+ openssl,
  python-dev,
  samba-dev | samba4-dev
 Section: net
@@ -37,10 +39,11 @@ Homepage: http://www.freeradius.org/
 
 Package: freeradius
 Architecture: any
-Depends: lsb-base (>= 3.1-23.2), ${shlibs:Depends}, ${misc:Depends}, ${dist:Depends}, freeradius-common, freeradius-config, libfreeradius3 (= ${binary:Version}), ssl-cert, adduser
+Depends: lsb-base (>= 3.1-23.2), ${shlibs:Depends}, ${misc:Depends}, ${dist:Depends}, freeradius-common (>= 3.0.13), freeradius-config, libfreeradius3 (= ${binary:Version}), ssl-cert, adduser
 Provides: radius-server
 Recommends: freeradius-utils
 Suggests: freeradius-ldap, freeradius-postgresql, freeradius-mysql, freeradius-krb5, snmp
+Breaks: freeradius (<< 3)
 Description: high-performance and highly configurable RADIUS server
  FreeRADIUS is a high-performance RADIUS server with support for:
   - Authentication by local files, SQL, Kerberos, LDAP, PAM, and more.
@@ -184,3 +187,11 @@ Description: debug symbols for the FreeRADIUS packages
  FreeRADIUS is a modular, high performance and feature-rich RADIUS server.
  This package contains the detached debugging symbols for the Debian FreeRADIUS
  packages.
+
+Package: freeradius-abfab
+Depends: freeradius (= ${binary:Version})
+Recommends: moonshot-trust-router
+Architecture: all
+Description: FreeRADIUS ABFAB Support
+ This package enables sites and modules typically needed by GSS-EAP
+ (RFC 7055) identity providers and RP proxies.

diff --git a/debian/freeradius-abfab.postinst b/debian/freeradius-abfab.postinst
new file mode 100644 (file)
index 0000000..641548f
--- /dev/null
+++ b/debian/freeradius-abfab.postinst
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+  configure)
+        if [ -z "$2" ]; then
+           for foo in abfab-tr-idp abfab-tls channel_bindings ; do
+               test -e /etc/freeradius/sites-enabled/$foo || ln -s ../sites-available/$foo /etc/freeradius/sites-enabled
+               done
+           for foo in abfab_psk_sql ; do
+               test -e /etc/freeradius/mods-enabled/$foo || ln -s ../mods-available/$foo /etc/freeradius/mods-enabled
+               done
+           adduser --quiet freerad trustrouter 2>/dev/null ||true
+           adduser --quiet trustrouter freerad 2>/dev/null ||true
+           fi
+       ;;
+    esac
+
+    #DEBHELPER#
+
+exit 0

diff --git a/debian/freeradius-abfab.postrm b/debian/freeradius-abfab.postrm
new file mode 100644 (file)
index 0000000..abd5d53
--- /dev/null
+++ b/debian/freeradius-abfab.postrm
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+set -e
+
+if [ $1 = purge ]; then
+    for foo in sites-enabled/channel_bindings sites-enabled/abfab-tr-idp sites-available/abfab-tls mods-enabled/abfab_psk_sql; do
+       test -e /etc/freeradius/$foo &&rm /etc/freeradius/$foo
+       done
+    fi
+
+    #DEBHELPER#
+
+exit 0

diff --git a/debian/freeradius-ldap.postinst b/debian/freeradius-ldap.postinst
index adfb99d..784681e 100644 (file)
--- a/debian/freeradius-ldap.postinst
+++ b/debian/freeradius-ldap.postinst
@@ -5,8 +5,10 @@ set -e
 case "$1" in
   configure)
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-          invoke-rc.d freeradius force-reload
+          # Customized by Painless Security: Don't abort install if the reload fails
+          invoke-rc.d freeradius force-reload || true
         else
+          # Customized by Painless Security: Don't abort install if the reload fails
           /etc/init.d/freeradius force-reload
         fi
         ;;

diff --git a/debian/freeradius-mysql.postinst b/debian/freeradius-mysql.postinst
index 1b074d9..f3ba4fe 100644 (file)
--- a/debian/freeradius-mysql.postinst
+++ b/debian/freeradius-mysql.postinst
@@ -5,9 +5,11 @@ set -e
 case "$1" in
   configure)
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-          invoke-rc.d freeradius force-reload
+          # Customized by Painless Security: Don't abort install if the reload fails
+          invoke-rc.d freeradius force-reload || true
         else
-          /etc/init.d/freeradius force-reload
+          # Customized by Painless Security: Don't abort install if the reload fails
+          /etc/init.d/freeradius force-reload || true
         fi
        ;;
 esac

diff --git a/debian/freeradius-postgresql.postinst b/debian/freeradius-postgresql.postinst
index 89022bf..442e0d0 100644 (file)
--- a/debian/freeradius-postgresql.postinst
+++ b/debian/freeradius-postgresql.postinst
@@ -4,10 +4,27 @@ set -e
 
 case "$1" in
   configure)
+        for file in `find /etc/freeradius/mods-config/sql/main/postgresql -print` 
+        do
+          if ! dpkg-statoverride --list | grep -qw $file$; then
+            dpkg-statoverride --add --update root freerad 0640 $file
+          fi
+        done
+
+        for dir in /etc/freeradius/mods-config/sql/main \
+          /etc/freeradius/mods-config/sql/main/postgresql
+        do
+          if ! dpkg-statoverride --list | grep -qw $dir$; then
+            dpkg-statoverride --add --update root freerad 2751 $dir
+          fi
+        done
+
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-          invoke-rc.d freeradius force-reload
+          # Customized by Painless Security: Don't abort install if the reload fails
+          invoke-rc.d freeradius force-reload || true
         else
-          /etc/init.d/freeradius force-reload
+          # Customized by Painless Security: Don't abort install if the reload fails
+          /etc/init.d/freeradius force-reload || true
         fi
        ;;
 esac