From b0adcf75809db73a42c5af5394957c4a84b28840 Mon Sep 17 00:00:00 2001
From: Olivier Beytrison <olivier@heliosnet.org>
Date: Sat, 8 Dec 2012 10:39:13 +0100
Subject: [PATCH] fix debian and Makefile for new filters

---
 debian/freeradius.install  |  6 +-----
 debian/freeradius.postinst | 14 +++++---------
 debian/freeradius.prerm    |  6 +-----
 raddb/Makefile             | 12 ++++++------
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/debian/freeradius.install b/debian/freeradius.install
index aba570ea292..4dd092db7ca 100644
--- a/debian/freeradius.install
+++ b/debian/freeradius.install
@@ -1,9 +1,5 @@
 etc/freeradius/acct_users
-etc/freeradius/attrs
-etc/freeradius/attrs.access_reject
-etc/freeradius/attrs.access_challenge
-etc/freeradius/attrs.accounting_response
-etc/freeradius/attrs.pre-proxy
+etc/freeradius/filter/*
 etc/freeradius/clients.conf
 etc/freeradius/experimental.conf
 etc/freeradius/hints
diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index c878136f742..91b4b8c7856 100755
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -28,13 +28,8 @@ case "$1" in
             /etc/freeradius/experimental.conf \
             /etc/freeradius/huntgroups \
             /etc/freeradius/proxy.conf \
-            /etc/freeradius/attrs.pre-proxy \
             /etc/freeradius/hints \
-            /etc/freeradius/attrs \
             /etc/freeradius/policy.txt \
-            /etc/freeradius/attrs.accounting_response \
-            /etc/freeradius/attrs.access_reject \
-            /etc/freeradius/attrs.access_challenge \
             /etc/freeradius/clients.conf \
             /etc/freeradius/acct_users
           do
@@ -43,10 +38,11 @@ case "$1" in
             fi
           done
 
-          for dir in /etc/freeradius/certs/ \
-            /etc/freeradius/sites-available/ \
-            /etc/freeradius/sites-enabled/ \
-            /etc/freeradius/policy.d/
+          for dir in /etc/freeradius/certs \
+            /etc/freeradius/sites-available \
+            /etc/freeradius/sites-enabled \
+            /etc/freeradius/filter \
+            /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 a34c6deea8a..cc61b011709 100755
--- a/debian/freeradius.prerm
+++ b/debian/freeradius.prerm
@@ -14,13 +14,8 @@ case "$1" in
           /etc/freeradius/experimental.conf \
           /etc/freeradius/huntgroups \
           /etc/freeradius/proxy.conf \
-          /etc/freeradius/attrs.pre-proxy \
           /etc/freeradius/hints \
-          /etc/freeradius/attrs \
           /etc/freeradius/policy.txt \
-          /etc/freeradius/attrs.accounting_response \
-          /etc/freeradius/attrs.access_reject \
-          /etc/freeradius/attrs.access_challenge \
           /etc/freeradius/clients.conf \
           /etc/freeradius/acct_users
         do
@@ -33,6 +28,7 @@ case "$1" in
           /etc/freeradius/sites-available \
           /etc/freeradius/sites-enabled \
           /etc/freeradius/policy.d \
+          /etc/freeradius/filter \
           /var/run/freeradius \
           /var/log/freeradius
         do
diff --git a/raddb/Makefile b/raddb/Makefile
index 169a92bf9b6..f7a5c922915 100644
--- a/raddb/Makefile
+++ b/raddb/Makefile
@@ -9,11 +9,10 @@ include ../Make.inc
 #
 #  The list of files to install.
 #
-FILES = acct_users attrs attrs.access_reject attrs.accounting_response	\
-	attrs.pre-proxy clients.conf dictionary templates.conf	\
-	experimental.conf hints huntgroups \
-	policy.txt preproxy_users proxy.conf radiusd.conf trigger.conf	\
-	users attrs.access_challenge README.rst
+FILES = acct_users clients.conf dictionary templates.conf \
+	experimental.conf hints huntgroups policy.txt \
+	preproxy_users proxy.conf radiusd.conf trigger.conf \
+	users README.rst
 
 DEFAULT_SITES = default inner-tunnel
 
@@ -59,8 +58,9 @@ install:
 	$(INSTALL) -d -m 750	$(R)$(raddbdir)/mods-available
 	$(INSTALL) -d -m 750	$(R)$(raddbdir)/mods-enabled
 	$(INSTALL) -d -m 750	$(R)$(raddbdir)/policy.d
+	$(INSTALL) -d -m 750	$(R)$(raddbdir)/filter
 	@echo "Creating/updating files in $(R)$(raddbdir)"; \
-	for i in $(FILES) `find sites-available/ mods-available/ policy.d/ -type f -print | sed 's/.*~//;s/.*#.*//' `; do \
+	for i in $(FILES) `find sites-available/ mods-available/ policy.d/ filter/ -type f -print | sed 's/.*~//;s/.*#.*//' `; do \
 		[ ! -f $(R)$(raddbdir)/$$i ] && $(INSTALL) -m 640 $$i $(R)$(raddbdir)/$$i; \
 		if [ "`find $$i -newer $(R)$(raddbdir)/$$i`" ]; then \
 			echo "** $(R)$(raddbdir)/$$i"; \
-- 
2.47.3