debian: use debhelper compat 3

debian: remove freerad from shadow group properly, when purging

diff --git a/debian/control b/debian/control
index dfefa79..8e72beb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: radiusd-freeradius
-Build-Depends: debhelper, libltdl3-dev, libpam0g-dev, postgresql-dev, libmysqlclient6-dev | libmysqlclient10-dev, libgdbmg1-dev, libldap2-dev, libsasl-dev, libsnmp4.2-dev, libiodbc2-dev, libkrb5-dev
+Build-Depends: debhelper, libltdl3-dev | libltdl0-dev, libpam0g-dev, postgresql-dev, libmysqlclient6-dev | libmysqlclient10-dev, libgdbmg1-dev, libldap2-dev, libsasl-dev, libsnmp4.2-dev, libiodbc2-dev, libkrb5-dev
 Section: non-US/main
 Priority: optional
 Maintainer: Chad Miller <cmiller@debian.org>

diff --git a/debian/radiusd-freeradius.conffiles b/debian/radiusd-freeradius.conffiles
deleted file mode 100644 (file)
index 941a638..0000000
--- a/debian/radiusd-freeradius.conffiles
+++ /dev/null
@@ -1,32 +0,0 @@
-/etc/cron.daily/freeradius
-/etc/cron.monthly/freeradius
-/etc/init.d/freeradius
-/etc/raddb/acct_users
-/etc/raddb/attrs
-/etc/raddb/clients
-/etc/raddb/clients.conf
-/etc/raddb/dictionary
-/etc/raddb/dictionary.acc
-/etc/raddb/dictionary.ascend
-/etc/raddb/dictionary.bay
-/etc/raddb/dictionary.cisco
-/etc/raddb/dictionary.compat
-/etc/raddb/dictionary.livingston
-/etc/raddb/dictionary.microsoft
-/etc/raddb/dictionary.redback
-/etc/raddb/dictionary.shasta
-/etc/raddb/dictionary.shiva
-/etc/raddb/dictionary.tunnel
-/etc/raddb/dictionary.usr
-/etc/raddb/dictionary.versanet
-/etc/raddb/hints
-/etc/raddb/huntgroups
-/etc/raddb/ldap.attrmap
-/etc/raddb/naslist
-/etc/raddb/naspasswd
-/etc/raddb/proxy.conf
-/etc/raddb/radiusd.conf
-/etc/raddb/realms
-/etc/raddb/snmp.conf
-/etc/raddb/sql.conf
-/etc/raddb/users

diff --git a/debian/radiusd-freeradius.postinst b/debian/radiusd-freeradius.postinst
index 5d8d89d..ac3407b 100755 (executable)
--- a/debian/radiusd-freeradius.postinst
+++ b/debian/radiusd-freeradius.postinst
@@ -9,7 +9,7 @@ case "$1" in
        groups freerad >/dev/null || adduser --system --no-create-home --home /etc/raddb --ingroup freerad --disabled-password freerad
 
        # make sure there is a user and group 'freerad'
-       groups freerad |grep freerad >/dev/null
+       groups freerad |grep freerad 2>/dev/null
 
        # put user freerad in group shadow, so the daemon can auth locally
        usermod -G shadow freerad

diff --git a/debian/radiusd-freeradius.postrm b/debian/radiusd-freeradius.postrm
index 0110a1a..dbd6d8c 100755 (executable)
--- a/debian/radiusd-freeradius.postrm
+++ b/debian/radiusd-freeradius.postrm
@@ -15,17 +15,17 @@ case "$1" in
                if [ -d /var/log/radiusd-freeradius ] 
                then
                        cd /var/log/radiusd-freeradius
-                       rm -f radius.log radius.log.0 radius.log.*.gz
-                       rm -f radwtmp radwtmp.0 radwtmp.*.gz
+                       rm -f radius.log radius.log.* radius.log.*.gz
+                       rm -f radwtmp radwtmp.* radwtmp.*.gz
                        rm -f radutmp radwatch.log
-                       [ -d radacct ] && rm -rf radacct
+                       test -d radacct && rm -rf radacct
 
                        cd /var/log
                        rm -rf /var/log/radiusd-freeradius
                fi
                rm -rf /etc/raddb
+               deluser freerad shadow || true
                deluser freerad || true
-               delgroup freerad || true
                ;;
        *)
                ;;

diff --git a/debian/rules b/debian/rules
index f1be43a..8ecd66f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #
 
 SHELL=/bin/bash
-DH_VERBOSE=1
+DH_COMPAT=3
 
 package = freeradius
 debiandir = $(shell pwd)/debian
@@ -46,12 +46,12 @@ binary-arch: build
        dh_undocumented 
        install -g root -m 644 CREDITS $(tmp)/$(pkgdocdir)/credits
        find doc -type f -maxdepth 1 ! -path doc/ChangeLog -exec dh_installdocs {} \;
-       dh_installchangelogs doc/ChangeLog
+       # dh_installchangelogs doc/ChangeLog
        dh_compress
        # supporting programs
        install -g root -m 755 scripts/radiusd.cron.daily $(tmp)/$(prefix)/etc/cron.daily/freeradius
        install -g root -m 755 scripts/radiusd.cron.monthly $(tmp)/$(prefix)/etc/cron.monthly/freeradius
-       install -g root -m 755 scripts/rc.radiusd $(tmp)/$(prefix)/etc/init.d/freeradius
+       install -g root -m 755 $(debiandir)/initscript $(tmp)/$(prefix)/etc/init.d/freeradius
        TEMPFILE=`mktemp /tmp/radconf-XXXXXX`; \
        cp $(tmp)/$(raddbdir)/radiusd.conf $$TEMPFILE; \
        cat $$TEMPFILE \
@@ -87,18 +87,10 @@ sanitycheck:
        @echo -n "sanity: checking for overzealous undocumented file... "
        @find man/ -type f |grep \. |sed -e 's%man/man./%%' | { \
                while read manpage; do \
-                       grep $$manpage debian/undocumented | read filename && echo -n $$filename; \
+                       grep $$manpage debian/radiusd-freeradius.undocumented | read filename && echo -n $$filename; \
                done; \
        } || true
        @test -n $$filename
        @echo good.
 
-       @echo -n "sanity: making sure conffiles lists all raddb files... "
-       @{ \
-               tree=`find raddb/ -type f |sed -e 's/\.in$$//' |grep -v CVS |grep -v /Makefile |sort |uniq`; \
-               debconf=`grep raddb debian/conffiles |sed -e 's%/etc/%%' |sort`; \
-               test "$$tree" = "$$debconf"; \
-       }
-       @echo good.
-
 .PHONY: binary binary-arch binary-indep clean sanitycheck