debian: check for exec failure in init script.

debian: exclude modules not listed in stable list.
debian: prepare for 0.7.2.

diff --git a/debian/changelog b/debian/changelog
index 27d9994..405b9b6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+radiusd-freeradius () unstable; urgency=low
+
+  * Explicitly excluding modules not in the "stable" list.
+  * Updated policy version number.
+  * Moved from non-US/main to main.
+  * Put pidfile in package's own directory.
+  * Package not as buggy and unstable modules are easily identifiable. 
+    (closes: Bug#142217)
+  * Init script handles failure better. (closes: Bug#151264)
+  * New upstream release.  (closes: Bug#140536)
+  * Uses available version of postgresql.  (closes: Bug#139290)
+
+ -- Chad Miller <cmiller@debian.org>  Wed, 25 Sep 2002 11:10:52 -0400
+
 radiusd-freeradius (0.5+cvs20020408-1) unstable; urgency=high
 
   * New build-dep on libssl-dev, which is implied by another dep, but making 

diff --git a/debian/control b/debian/control
index 26e573b..ae48a0d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Build-Depends: debhelper, libltdl3-dev | libltdl0-dev, libpam0g-dev, postgresql-
 Section: admin
 Priority: optional
 Maintainer: Chad Miller <cmiller@debian.org>
-Standards-Version: 3.2.1
+Standards-Version: 3.5.7
 
 Package: radiusd-freeradius
 Architecture: any

diff --git a/debian/initscript b/debian/initscript
index e24a1c4..1ed65f3 100755 (executable)
--- a/debian/initscript
+++ b/debian/initscript
@@ -5,7 +5,7 @@ set -u
 
 prog="radiusd"
 program="/usr/sbin/radiusd"
-pidfile="/var/run/radiusd/radiusd.pid"
+pidfile="/var/run/radiusd-freeradius/radiusd.pid"
 descr="FreeRADIUS daemon"
 
 test -f $program || exit 0
@@ -13,7 +13,12 @@ test -f $program || exit 0
 case "$1" in
 start) echo -n "Starting $descr: "
         start-stop-daemon --start --quiet --pidfile $pidfile --exec $program
-        echo "$prog."
+       if [ $? = 0 ]; then
+               echo "$prog."
+       else
+               echo "(failed!  run '$program -x' to find out why.)"
+               exit 1
+       fi
        ;;
 stop)  echo -n "Stopping $descr: "
         start-stop-daemon --stop --quiet --pidfile $pidfile

diff --git a/debian/radiusd-freeradius.prerm b/debian/radiusd-freeradius.prerm
index 4ff613c..d9a1168 100755 (executable)
--- a/debian/radiusd-freeradius.prerm
+++ b/debian/radiusd-freeradius.prerm
@@ -20,7 +20,7 @@ then
                rm -f /usr/doc/radiusd-freeradius
        fi
        /etc/init.d/freeradius stop
-       rm -rf /var/run/radiusd
+       rm -rf /var/run/radiusd-freeradius
 fi
 
 exit 0

diff --git a/debian/rules b/debian/rules
index a55b2ee..419107e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,8 @@ build:
 # Builds the binary package.
        dh_testdir
        # dh_testroot
-       ./configure --prefix=$(prefix) --exec-prefix=$(exec_prefix) --libdir=$(libdir) --mandir=$(mandir) --with-logdir=$(logdir) --with-thread-pool --enable-ltdl-install=no --enable-strict-dependencies --without-rlm_python --without-rlm_ippool
+       ##./configure --prefix=$(prefix) --exec-prefix=$(exec_prefix) --libdir=$(libdir) --mandir=$(mandir) --with-logdir=$(logdir) --with-thread-pool --enable-ltdl-install=no --enable-strict-dependencies --without-rlm_python --without-rlm_ippool
+       ./configure --prefix=$(prefix) --exec-prefix=$(exec_prefix) --libdir=$(libdir) --mandir=$(mandir) --with-logdir=$(logdir) --with-thread-pool --enable-ltdl-install=no --enable-strict-dependencies `{ cd src/modules; ls -d rlm_*; } |while read dir; do egrep $$dir src/modules/stable >/dev/null || echo --disable-$$dir; done`
        make
        touch build
 
@@ -36,18 +37,18 @@ binary-arch: build
        dh_installdirs
        make install prefix=$(prefix) exec_prefix=$(exec_prefix) mandir=$(mandir) libdir=$(libdir) R=$(radiusd_freeradius_dir)
        # clean up install cruft.  $$&@!%
-       rmdir $(radiusd_freeradius_dir)/$(execprefix)/include
+       test ! -d $(radiusd_freeradius_dir)/$(execprefix)/include || rmdir $(radiusd_freeradius_dir)/$(execprefix)/include
        rm $(radiusd_freeradius_dir)/$(execprefix)/usr/sbin/rc.radiusd
        # split out inconvenient/controversal modules to other places
        for modname in krb5 ldap mysql postgresql; do \
                mkdir -p $(debiandir)/radiusd-freeradius-$${modname}/$(libdir); \
-               mv $(radiusd_freeradius_dir)/$(libdir)/rlm*_$${modname}.* $(debiandir)/radiusd-freeradius-$${modname}/$(libdir)/; \
+               mv $(radiusd_freeradius_dir)/$(libdir)/rlm*_$${modname}* $(debiandir)/radiusd-freeradius-$${modname}/$(libdir)/; \
        done
        # man pages & docs
        dh_undocumented 
        install -g root -m 644 CREDITS $(radiusd_freeradius_dir)/$(pkgdocdir)/credits
-       find doc -type f -maxdepth 1 ! -path doc/ChangeLog -exec dh_installdocs {} \;
-       find src/modules/rlm_sql/drivers -type f -name \*.sql -exec dh_installdocs {} \;
+       dh_installdocs `find doc -type f -maxdepth 1 ! -path doc/ChangeLog`
+       dh_installdocs `find src/modules/rlm_sql/drivers -type f -name \*.sql`
        # dh_installchangelogs doc/ChangeLog
        dh_compress
        # supporting programs
@@ -58,9 +59,10 @@ binary-arch: build
        cat $$TEMPFILE \
                | sed -e 's/        /   /g' \
                | sed -e '/^    example {/,/^   }/s/^/#/' \
-               | sed -e 's/^           #       shadow          =/              shadow          =/' \
+               | sed -e 's/#   shadow = /shadow = /' \
                | sed -e 's/^group = nobody/group = freerad/' \
                | sed -e 's/^user = nobody/user = freerad/' \
+               | sed -e 's@/run/radiusd@/run/radiusd-freeradius@' \
                        > $(radiusd_freeradius_dir)/$(raddbdir)/radiusd.conf; \
        rm $$TEMPFILE
        #