Debian updates stolen from CVS HEAD

diff --git a/debian/changelog b/debian/changelog
index 2bcb565..8b97f8f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,22 @@
 freeradius (1.0.2-0) unstable; urgency=low
 
   * New upstream release
-
- -- Paul Hampson <Paul.Hampson@anu.edu.au>  Sun, 19 Dec 2004 14:28:22 +1100
+  * Update for Debian Policy 3.6.1.1
+   - Change test if invoke-rc.d as per Policy 9.3.3.2
+  * freeradius-dialupadmin Suggests php4-mysql | php4-pgsql
+     Closes: #279419
+  * Added a two-second pause to restart in init.d script
+     Closes: #262635
+  * FreeRADIUS module packages now depend on the same source
+    version of the main FreeRADIUS package.
+     Closes: #284353
+  * FreeRADIUS-dialupadmin's default paths in admin.conf are
+    now correct.
+     Closes: #280942
+  * FreeRADIUS-dialupadmin's help.php3 can now find README.
+     Closes: #280941
+
+ -- Paul Hampson <Paul.Hampson@anu.edu.au>  Wed, 29 Dec 2004 20:12:52 +1100
 
 freeradius (1.0.1-0) unstable; urgency=high
 

diff --git a/debian/control b/debian/control
index 816264f..3c09508 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Build-Depends: debhelper (>= 4.1.68), libltdl3-dev, libpam0g-dev, postgresql-dev
 Section: net
 Priority: optional
 Maintainer: Paul Hampson <Paul.Hampson@anu.edu.au>
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.1.1
 
 Package: freeradius
 Architecture: any
@@ -26,7 +26,7 @@ Package: freeradius-krb5
 Architecture: any
 Conflicts: radiusd-freeradius-krb5
 Replaces: radiusd-freeradius-krb5
-Depends: freeradius, ${shlibs:Depends}
+Depends: freeradius (= ${Source-Version}), ${shlibs:Depends}
 Description: kerberos module for FreeRADIUS server
  The FreeRADIUS server can use Kerberos to authenticate users, and this module
  is necessary for that.
@@ -35,7 +35,7 @@ Package: freeradius-ldap
 Architecture: any
 Conflicts: radiusd-freeradius-ldap
 Replaces: radiusd-freeradius-ldap
-Depends: freeradius, ${shlibs:Depends}
+Depends: freeradius (= ${Source-Version}), ${shlibs:Depends}
 Description: LDAP module for FreeRADIUS server
  The FreeRADIUS server can use LDAP to authenticate users, and this module
  is necessary for that.
@@ -44,7 +44,7 @@ Package: freeradius-postgresql
 Architecture: any
 Conflicts: radiusd-freeradius-postgresql
 Replaces: radiusd-freeradius-postgresql
-Depends: freeradius, ${shlibs:Depends}
+Depends: freeradius (= ${Source-Version}), ${shlibs:Depends}
 Description: PostgreSQL module for FreeRADIUS server
  The FreeRADIUS server can use PostgreSQL to authenticate users and do
  accounting, and this module is necessary for that.
@@ -53,14 +53,14 @@ Package: freeradius-mysql
 Architecture: any
 Conflicts: radiusd-freeradius-mysql
 Replaces: radiusd-freeradius-mysql
-Depends: freeradius, ${shlibs:Depends}
+Depends: freeradius (= ${Source-Version}), ${shlibs:Depends}
 Description: MySQL module for FreeRADIUS server
  The FreeRADIUS server can use MySQL to authenticate users and do accounting,
  and this module is necessary for that.
 
 Package: freeradius-iodbc
 Architecture: any
-Depends: freeradius, ${shlibs:Depends}
+Depends: freeradius (= ${Source-Version}), ${shlibs:Depends}
 Description: iODBC module for FreeRADIUS server
  The FreeRADIUS server can use iODBC to access databases to authenticate users
  and do accounting, and this module is necessary for that.
@@ -68,6 +68,7 @@ Description: iODBC module for FreeRADIUS server
 Package: freeradius-dialupadmin
 Architecture: all
 Depends: apache | httpd, php4 | php4-cgi
+Suggests: php4-mysql | php4-pgsql
 Recommends: ${perl:Depends}
 Description: set of PHP scripts for administering a FreeRADIUS server
  These scripts provide a web-based interface for administering a FreeRADIUS

diff --git a/debian/copyright b/debian/copyright
index 4c9d75f..5877fe1 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,3 +30,19 @@ version 2 of the License, or (at your option) any later version.
 
 On Debian systems, the complete text of the GNU Lesser General Public
 License can be found in /usr/share/common-licenses/LGPL.
+
+--
+Some GPL parts of this software depend on OpenSSL, the combination of
+which cannot be distributed in compiled binary form. The following
+modules cannot be enabled as they directly depend on OpenSSL:
+
+rlm_eap_peap
+rlm_eap_tls
+rlm_eap_ttls
+rlm_x99_token
+
+Also, the FreeRADIUS core's SNMP support and the rlm_sql_postgresql
+module transitively depend on OpenSSL via libsnmp{4.2,5} and libpq3
+so they cannot be enabled currently, but this is subject to changes
+in the relevant packages within Debian, or having useable alternate
+libraries in Debian.

diff --git a/debian/freeradius-iodbc.postinst b/debian/freeradius-iodbc.postinst
index 5a6aee8..f44cb4e 100755 (executable)
--- a/debian/freeradius-iodbc.postinst
+++ b/debian/freeradius-iodbc.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-       if [ -x /usr/sbin/invoke-rc.d ] ; then
+       if command -v invoke-rc.d >/dev/null 2>&1; then
                invoke-rc.d freeradius restart
        else
                /etc/init.d/freeradius restart

diff --git a/debian/freeradius-krb5.postinst b/debian/freeradius-krb5.postinst
index 5a6aee8..f44cb4e 100755 (executable)
--- a/debian/freeradius-krb5.postinst
+++ b/debian/freeradius-krb5.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-       if [ -x /usr/sbin/invoke-rc.d ] ; then
+       if command -v invoke-rc.d >/dev/null 2>&1; then
                invoke-rc.d freeradius restart
        else
                /etc/init.d/freeradius restart

diff --git a/debian/freeradius-ldap.postinst b/debian/freeradius-ldap.postinst
index 5a6aee8..f44cb4e 100755 (executable)
--- a/debian/freeradius-ldap.postinst
+++ b/debian/freeradius-ldap.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-       if [ -x /usr/sbin/invoke-rc.d ] ; then
+       if command -v invoke-rc.d >/dev/null 2>&1; then
                invoke-rc.d freeradius restart
        else
                /etc/init.d/freeradius restart

diff --git a/debian/freeradius-mysql.postinst b/debian/freeradius-mysql.postinst
index 5a6aee8..f44cb4e 100755 (executable)
--- a/debian/freeradius-mysql.postinst
+++ b/debian/freeradius-mysql.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-       if [ -x /usr/sbin/invoke-rc.d ] ; then
+       if command -v invoke-rc.d >/dev/null 2>&1; then
                invoke-rc.d freeradius restart
        else
                /etc/init.d/freeradius restart

diff --git a/debian/freeradius-postgresql.postinst b/debian/freeradius-postgresql.postinst
index 5a6aee8..f44cb4e 100755 (executable)
--- a/debian/freeradius-postgresql.postinst
+++ b/debian/freeradius-postgresql.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-       if [ -x /usr/sbin/invoke-rc.d ] ; then
+       if command -v invoke-rc.d >/dev/null 2>&1; then
                invoke-rc.d freeradius restart
        else
                /etc/init.d/freeradius restart

diff --git a/debian/freeradius.init b/debian/freeradius.init
index 188ac20..6574dbe 100755 (executable)
--- a/debian/freeradius.init
+++ b/debian/freeradius.init
@@ -26,6 +26,7 @@ stop) echo -n "Stopping $descr: "
         ;;
 restart) echo -n "Restarting $descr: "
                $0 stop
+               sleep 2
                $0 start
         ;;
 reload|force-reload) 

diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index 60df502..ca16294 100755 (executable)
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -46,7 +46,7 @@ case "$1" in
                action="restart"
        fi
 
-       if [ -x /usr/sbin/invoke-rc.d ] ; then
+       if command -v invoke-rc.d >/dev/null 2>&1; then
                invoke-rc.d freeradius $action || true
        else
                /etc/init.d/freeradius $action
@@ -56,7 +56,7 @@ case "$1" in
   abort-upgrade)
        ;;
   abort-remove)
-       if [ -x /usr/sbin/invoke-rc.d ] ; then
+       if command -v invoke-rc.d >/dev/null 2>&1; then
                invoke-rc.d freeradius start || true
        else
                /etc/init.d/freeradius start

diff --git a/debian/freeradius.prerm b/debian/freeradius.prerm
index 7257cb3..fb23649 100755 (executable)
--- a/debian/freeradius.prerm
+++ b/debian/freeradius.prerm
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   remove)
-       if [ -x /usr/sbin/invoke-rc.d ] ; then
+       if command -v invoke-rc.d >/dev/null 2>&1; then
                invoke-rc.d freeradius stop || true
        else
                /etc/init.d/freeradius stop

diff --git a/debian/rules b/debian/rules
index eaf350a..f61bbb7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -122,12 +122,40 @@ binary-arch: stamp-build
        dh_install -p freeradius-dialupadmin -XCVS -XChangelog -XREADME -Xconf/ -Xdoc/ -Xdialup_admin.cron dialup_admin/* usr/share/freeradius-dialupadmin/
        dh_link -p freeradius-dialupadmin etc/freeradius-dialupadmin/ usr/share/freeradius-dialupadmin/conf
        dh_perl -p freeradius-dialupadmin dialup_admin/bin/*
-# Fix the crontab example to point to the right directory, and 
+# Fix the crontab example to point to the right directory
        cat $(freeradius_dir)-dialupadmin/usr/share/doc/freeradius-dialupadmin/examples/dialup_admin.cron \
                | sed -e 's#/usr/local/dialup_admin#/usr/share/freeradius-dialupadmin#' \
                > $(freeradius_dir)-dialupadmin/usr/share/doc/freeradius-dialupadmin/examples/freeradius-dialupadmin.cron
        rm $(freeradius_dir)-dialupadmin/usr/share/doc/freeradius-dialupadmin/examples/dialup_admin.cron
-
+       TEMPFILE=`mktemp /tmp/dialupconf-XXXXXX`; \
+       cp $(freeradius_dir)-dialupadmin/etc/freeradius-dialupadmin/admin.conf $$TEMPFILE; \
+       cat $$TEMPFILE \
+               | sed -e 's#/usr/local/dialup_admin#/usr/share/freeradius-dialupadmin#' \
+                       -e 's#/usr/local/radiusd#/usr#' \
+                       -e 's#general_raddb_dir: %{general_radiusd_base_dir}/etc/raddb#general_raddb_dir: /etc/freeradius#' \
+                       -e 's#general_clients_conf: /usr/local/etc/raddb/clients.conf#general_clients_conf: /etc/freeradius/clients.conf#' \
+                       -e 's#%{general_base_dir}/conf#%/etc/freeradius-dialupadmin#' \
+                       -e 's#/usr/local/bin#/usr/bin#' \
+               > $(freeradius_dir)-dialupadmin/etc/freeradius-dialupadmin/admin.conf; \
+       rm $$TEMPFILE;
+       TEMPFILE=`mktemp /tmp/dialuphelp-XXXXXX`; \
+       cp $(freeradius_dir)-dialupadmin/usr/share/freeradius-dialupadmin/htdocs/help/help.php3 $$TEMPFILE; \
+       cat $$TEMPFILE \
+               | sed -e 's#readfile#readgzfile#' \
+                       -e 's#../../README#/usr/share/doc/freeradius-dialupadmin/README.gz#' \
+                       -e 's#../../doc/HOWTO#/usr/share/doc/freeradius-dialupadmin/HOWTO.gz#' \
+                       -e 's#../../doc/FAQ#/usr/share/doc/freeradius-dialupadmin/FAQ#' \
+               > $(freeradius_dir)-dialupadmin/usr/share/freeradius-dialupadmin/htdocs/help/help.php3; \
+       rm $$TEMPFILE;
+       for binfile in $(freeradius_dir)-dialupadmin/usr/share/freeradius-dialupadmin/bin/*; do \
+               TEMPFILE=`mktemp /tmp/dialupbin-XXXXXX`; \
+               cp $$binfile $$TEMPFILE; \
+               cat $$TEMPFILE \
+                       | sed -e 's#/usr/local/bin/#/usr/bin/#' \
+                               -e 's#/usr/local/dialup_admin/conf/#/etc/freeradius-dialupadmin/#' \
+                       > $$binfile; \
+               rm $$TEMPFILE; \
+       done
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        dh_strip