Patches to work with the new organization of files

diff --git a/debian/freeradius-mysql.install b/debian/freeradius-mysql.install
index c01e1ed6942d52ebcb155c59caff306aa9748e56..81355ca0b637f6d67e0ae852a16681a650145465 100644 (file)
--- a/debian/freeradius-mysql.install
+++ b/debian/freeradius-mysql.install
@@ -1,3 +1,3 @@
 usr/lib/freeradius/rlm_sql_mysql*.so
 etc/freeradius/sql/mysql/*
-etc/freeradius/modules/sql*
+etc/freeradius/mods-available/sql*

diff --git a/debian/freeradius-utils.install b/debian/freeradius-utils.install
index ba915038f553ae7715483abedbaeb68263e1c13d..aa87027623421cf7843df3658f2367613743509b 100644 (file)
--- a/debian/freeradius-utils.install
+++ b/debian/freeradius-utils.install
@@ -9,3 +9,4 @@ usr/bin/radlast
 usr/bin/radtest
 usr/bin/radzap
 usr/bin/radsqlrelay
+usr/bin/radcrypt

diff --git a/debian/freeradius.examples b/debian/freeradius.examples
index 3bfe7c36ecf028c1f70f7812545cd2ab89e721cf..a6b13c4a54e149da95fdc38ac5fa7b9332da27d3 100644 (file)
--- a/debian/freeradius.examples
+++ b/debian/freeradius.examples
@@ -13,10 +13,7 @@ scripts/radiusd.cron.monthly
 scripts/radiusd.cron.monthly.in
 scripts/radiusd.sh
 scripts/radsqlrelay
-scripts/radwatch
-scripts/radwatch.in
 scripts/rc.radiusd
 scripts/rc.radiusd.in
 scripts/users2mysql.pl
-debian/tmp/etc/freeradius/example.pl
 debian/tmp/etc/freeradius/certs

diff --git a/debian/freeradius.install b/debian/freeradius.install
index a4cc755d73d42854592b48b8a5bc0b4303cd46e4..9cbc364ca9a92d42d254da9c763b43813224cfcd 100644 (file)
--- a/debian/freeradius.install
+++ b/debian/freeradius.install
@@ -10,7 +10,7 @@ etc/freeradius/hints
 etc/freeradius/huntgroups
 etc/freeradius/ldap.attrmap
 etc/freeradius/mods-available/*
-etc/freeradius/policy.conf
+etc/freeradius/policy.d/*
 etc/freeradius/policy.txt
 etc/freeradius/preproxy_users
 etc/freeradius/proxy.conf
@@ -20,6 +20,5 @@ etc/freeradius/users
 usr/lib/freeradius/rlm*.so
 usr/sbin/checkrad
 usr/sbin/freeradius
-usr/sbin/radwatch
 usr/sbin/raddebug
 usr/sbin/radmin

diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index 4258cce4e600568be93a76c013f5f11b1ac8c508..bb8b3d327a02f64433753ddbbdb957ca0800158d 100755 (executable)
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -25,7 +25,6 @@ case "$1" in
           done
 
           for file in /etc/freeradius/preproxy_users \
-            /etc/freeradius/policy.conf \
             /etc/freeradius/experimental.conf \
             /etc/freeradius/huntgroups \
             /etc/freeradius/proxy.conf \
@@ -47,7 +46,8 @@ case "$1" in
 
           for dir in /etc/freeradius/certs/ \
             /etc/freeradius/sites-available/ \
-            /etc/freeradius/sites-enabled/
+            /etc/freeradius/sites-enabled/ \
+            /etc/freeradius/policy.d/
           do
             if ! dpkg-statoverride --list | grep -qw $dir$; then
               dpkg-statoverride --add --update freerad freerad 2751 $dir

diff --git a/debian/freeradius.prerm b/debian/freeradius.prerm
index a85a3956028364bd42921427803379e582df8fc0..201e14241070c22561804354b27ad8ff85d9d35c 100755 (executable)
--- a/debian/freeradius.prerm
+++ b/debian/freeradius.prerm
@@ -11,7 +11,6 @@ case "$1" in
        fi
 
         for file in /etc/freeradius/preproxy_users \
-          /etc/freeradius/policy.conf \
           /etc/freeradius/experimental.conf \
           /etc/freeradius/huntgroups \
           /etc/freeradius/proxy.conf \
@@ -34,6 +33,7 @@ case "$1" in
         for dir in /etc/freeradius/certs \
           /etc/freeradius/sites-available \
           /etc/freeradius/sites-enabled \
+          /etc/freeradius/policy.d \
           /var/run/freeradius \
           /var/log/freeradius
         do

diff --git a/debian/libfreeradius3.install b/debian/libfreeradius3.install
index 7d27cc7e37f202b67e1fc8c8ab64597e0a978f05..d08b127d28bcfb09bd3332d63a500869611d84ba 100644 (file)
--- a/debian/libfreeradius3.install
+++ b/debian/libfreeradius3.install
@@ -1 +1 @@
-usr/lib/freeradius/libfreeradius*-3.*.so
+usr/lib/freeradius/libfreeradius-radius.so