Debian changes. Not quite ready for upload. Soon...

diff --git a/debian/changelog b/debian/changelog
index d9a5325..889275e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-freeradius (0.0-2000112301) unstable; urgency=low
+radiusd-freeradius (0.0-2000122601) unstable; urgency=low
 
-  * Initial revision.
+  * Initial revision. (closes: Bug#76476)
 
- -- Chad Miller <cmiller@surfsouth.com>  Tue, 21 Nov 2000 10:10:45 -0500
+ -- Chad Miller <cmiller@debian.org>  Tue, 26 Dec 2000 11:41:11 -0500

diff --git a/debian/conffiles b/debian/conffiles
index f3717dc..b560e3f 100644 (file)
--- a/debian/conffiles
+++ b/debian/conffiles
@@ -1,4 +1,9 @@
+/etc/cron.daily/freeradius
+/etc/cron.monthly/freeradius
+/etc/init.d/freeradius
+/etc/raddb/bay.vendor
 /etc/raddb/clients
+/etc/raddb/clients.conf
 /etc/raddb/dictionary
 /etc/raddb/dictionary.acc
 /etc/raddb/dictionary.ascend
@@ -13,9 +18,8 @@
 /etc/raddb/huntgroups
 /etc/raddb/naslist
 /etc/raddb/naspasswd
-/etc/raddb/users
+/etc/raddb/proxy.conf
 /etc/raddb/radiusd.conf
 /etc/raddb/realms
-/etc/init.d/radiusd
-/etc/cron.daily/radiusd
-/etc/cron.monthly/radiusd
+/etc/raddb/snmp.conf
+/etc/raddb/users

diff --git a/debian/control b/debian/control
index 59e29e2..1e36f88 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
 Source: radiusd-freeradius
+Build-Depends: libltdl-dev | libltdl0-dev
 Section: net
 Priority: standard
 Maintainer: Chad Miller <cmiller@debian.org>
 Standards-Version: 3.2.1
 
-Package: freeradius
+Package: radiusd-freeradius
 Architecture: any
 Depends: ${shlibs:Depends}, libltdl | libltdl0
-Build-depends: libltdl-dev | libltdl0-dev
 Provides: radiusd
 Conflicts: radiusd, radiusd-livingston, radiusd-cistron
 Description: A high-performance and highly configurable RADIUS server

diff --git a/debian/copyright b/debian/copyright
index d7562c6..98ba946 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,8 @@
-This package was debianized by Chad Miller <cmiller@surfsouth.com> on
+This package was debianized by Chad Miller <cmiller@debian.org> on
 Fri, 24 Nov 2000 16:25:57 -0500.
 
 It was downloaded from http://freeradius.org/
 
-See the 'credits' file for authorship information.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

diff --git a/debian/postinst b/debian/postinst
index 17b436c..e653ab5 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,24 +1,26 @@
-#! /bin/sh
+#! /bin/sh -e
 
 case "$1" in
   configure)
-       update-rc.d radiusd defaults 50 > /dev/null
-       if [ ! -f /var/log/radius.log ]
+       update-rc.d freeradius defaults 50 >/dev/null
+       if [ ! -d /var/log/freeradius ]
        then
-               touch /var/log/radius.log
-               chmod 640 /var/log/radius.log
-               chown root:adm /var/log/radius.log
+               mkdir -p /var/log/freeradius
        fi
-       if [ ! -f /var/log/radwtmp ]
+       if [ ! -f /var/log/freeradius/radius.log ]
        then
-               touch /var/log/radwtmp
-               chmod 644 /var/log/radwtmp
-               chown root:adm /var/log/radius.log
+               touch /var/log/freeradius/radius.log
+               chmod 640 /var/log/freeradius/radius.log
+               chown root:adm /var/log/freeradius/radius.log
+       fi
+       if [ ! -f /var/log/freeradius/radwtmp ]
+       then
+               touch /var/log/freeradius/radwtmp
+               chmod 644 /var/log/freeradius/radwtmp
+               chown root:adm /var/log/freeradius/radius.log
        fi
-       [ -d /usr/doc -a ! -e /usr/doc/freeradius -a /usr/share/doc/freeradius ] && \
-               ln -sf ../share/doc/freeradius /usr/doc/freeradius
        ldconfig
-       /etc/init.d/radiusd start
+       /etc/init.d/freeradius start
        ;;
   abort-upgrade)
        ;;
@@ -28,4 +30,6 @@ case "$1" in
        ;;
 esac
 
+#DEBHELPER#
+
 exit 0

diff --git a/debian/postrm b/debian/postrm
index b1abea0..98ecec9 100755 (executable)
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,24 +1,28 @@
-#! /bin/sh
+#! /bin/sh -e
 
 case "$1" in
        remove)
+               update-rc.d -f freeradius remove
                ;;
        purge)
-               rmdir /etc/raddb 2>/dev/null
-               cd /var/log/radiusd
-               rm -f radius.log radius.log.0 radius.log.*.gz
-               rm -f radwtmp radwtmp.0 radwtmp.*.gz
-               rm -f radutmp radwatch.log
-               [ -d radacct ] && rm -rf radacct
+               if [ -d /var/log/freeradius ] 
+               then
+                       cd /var/log/freeradius
+                       rm -f radius.log radius.log.0 radius.log.*.gz
+                       rm -f radwtmp radwtmp.0 radwtmp.*.gz
+                       rm -f radutmp radwatch.log
+                       [ -d radacct ] && rm -rf radacct
+
+                       cd /var/log
+                       rm -rf /var/log/freeradius
+               fi
+               update-rc.d -f freeradius remove
+               rm -rf /etc/raddb
                ;;
        *)
                ;;
 esac
 
-case "$1" in
-       remove|purge)
-               update-rc.d radiusd remove > /dev/null
-               ;;
-esac
+#DEBHELPER#
 
 exit 0

diff --git a/debian/prerm b/debian/prerm
index 43d7d76..e8ca1f9 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,13 +1,9 @@
-#! /bin/sh
+#! /bin/sh -e
 
 case "$1" in
   remove)
-       /etc/init.d/radiusd stop
-       [ -L /usr/doc/freeradius ] && rm -f /usr/doc/freeradius
        ;;
   upgrade)
-       /etc/init.d/radiusd stop
-       [ -L /usr/doc/freeradius ] && rm -f /usr/doc/freeradius
        ;;
   failed-upgrade)
        ;;
@@ -15,4 +11,13 @@ case "$1" in
        ;;
 esac
 
+if [ "$1" = "upgrade" -o  "$1" = "remove" ]
+then
+       if [ -L /usr/doc/radiusd-freeradius ]
+       then
+               rm -f /usr/doc/radiusd-freeradius
+       fi
+       /etc/init.d/freeradius stop
+fi
+
 exit 0

diff --git a/debian/rules b/debian/rules
index e1df224..9a68950 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,32 +5,30 @@
 
 SHELL=/bin/bash
 
-# Name.
+export DH_VERBOSE=1
+
 package = freeradius
 tmp     = $(shell pwd)/debian/tmp
 
 prefix = /
 exec_prefix    = /usr
 mandir = $(exec_prefix)/share/man
+logdir = /var/log/freeradius
 pkgdocdir      = $(exec_prefix)/share/doc/freeradius
 
-define checkdir
-       test -f src/main/radiusd.c
-endef
-
-build:
+build: clean
 # Builds the binary package.
-       $(checkdir)
-       ./configure --prefix=$(prefix) --exec-prefix=$(exec_prefix) --mandir=$(mandir) --with-thread-pool --enable-ltdl-install=no
+       dh_testdir
+       # dh_testroot
+       ./configure --prefix=$(prefix) --exec-prefix=$(exec_prefix) --mandir=$(mandir) --with-logdir=$(logdir) --with-thread-pool --enable-ltdl-install=no
        make
        touch build
 
 # Architecture independant files.
 binary-indep:   build
-       $(checkdir)
 
 # Make a binary package (.deb file)
-binary-arch:   build checkroot
+binary-arch:   build
        dh_clean
        dh_installdirs
        make install prefix=$(prefix) exec_prefix=$(exec_prefix) mandir=$(mandir) R=$(tmp)
@@ -38,25 +36,25 @@ binary-arch:        build checkroot
        rmdir $(tmp)/include
        rm $(tmp)/usr/sbin/rc.radiusd
        # man pages & docs
-       find $(tmp)$(mandir) -type f -exec gzip -9 {} \;  # policy, sec 6.1
        dh_undocumented 
        install -g root -m 644 CREDITS $(tmp)$(pkgdocdir)/credits
-       dh_installdocs doc/*
-       dh_installchangelogs $(tmp)$(pkgdocdir)/ChangeLog
+       dh_installdocs doc/README*
+       dh_installchangelogs doc/ChangeLog
+       dh_compress
        # supporting programs
-       install -g root -m 755 scripts/rc.radiusd $(tmp)/etc/init.d/radiusd
-       install -g root -m 755 scripts/radiusd.cron.daily $(tmp)/etc/cron.daily/radiusd
-       install -g root -m 755 scripts/radiusd.cron.monthly $(tmp)/etc/cron.monthly/radiusd
+       install -g root -m 755 scripts/radiusd.cron.daily $(tmp)/etc/cron.daily/freeradius
+       install -g root -m 755 scripts/radiusd.cron.monthly $(tmp)/etc/cron.monthly/freeradius
+       install -g root -m 755 scripts/rc.radiusd $(tmp)/etc/init.d/freeradius
        # fix up conf file  --  all of these should be commented on in README.Debian
        cp $(tmp)/etc/raddb/radiusd.conf newconf
        cat newconf \
                | sed -e 's/        /   /g' \
-               | sed -e 's/       /    /g' \
                | sed -e '/^    pam {/,/^       }/s/^/#deb#/' \
                | sed -e 's/^   pam$$/#deb#     pam/' \
                | sed -e 's/^   radutmp$$/#deb# radutmp/' \
                | sed -e '/^    example {/,/^   }/s/^/#deb#/' \
                | sed -e '/^    sql .*{/,/^     }/s/^/#deb#/' \
+               | sed -e '/^    always .*{/,/^  }/s/^/#deb#/' \
                | sed -e 's/^           #       shadow          =/              shadow          =/' \
                | sed -e 's/^group = nobody/group = nogroup/' \
                        > $(tmp)/etc/raddb/radiusd.conf
@@ -72,17 +70,12 @@ binary-arch:        build checkroot
        dh_md5sums
        dh_gencontrol
        dh_builddeb
-       dh_clean
 
-clean: checkroot
+clean: 
        dh_clean
        [ -f Make.inc ] && make distclean || true
        rm -f build debian/{files,substvars}
 
 binary: binary-indep binary-arch
 
-checkroot:
-       $(checkdir)
-       test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean