Prepare for 1.0.4 release:

 - Regenerate configure from configure.in
 - Update packaging scripts for 1.0.4
 - Slight changes to Debian scripts for post-sarge package changes in sid

diff --git a/configure b/configure
index 7b7dcf7..527bcaa 100755 (executable)
--- a/configure
+++ b/configure
@@ -735,9 +735,9 @@ fi
 
 
 
-# From configure.in Revision: 1.198.2.12 
+# From configure.in Revision: 1.198.2.13 
 RADIUSD_MAJOR_VERSION=1
-RADIUSD_MINOR_VERSION=0.3
+RADIUSD_MINOR_VERSION=0.4
 RADIUSD_VERSION="${RADIUSD_MAJOR_VERSION}.${RADIUSD_MINOR_VERSION}"
 
 

diff --git a/debian/changelog b/debian/changelog
index 0fd579d..3d884ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
+freeradius (1.0.4-0) unstable; urgency=medium
+
+  * New upstream release, fixing build problems.
+  * Prefer libpq-dev over postgresql-dev as a build-dependancy.
+   - This requires us to use pgconfig to find the headers.
+
+ -- Paul Hampson <Paul.Hampson@anu.edu.au>  Thu, 16 Jun 2005 13:56:33 +1000
+
 freeradius (1.0.3-0) unstable; urgency=high
 
   * New upstream release
   * Urgency high for some denial-of-service fixes:
     - SQL injection attacks and DoS (core dump) via buffer overflow.
-       
+      Closes: #307720
+
  -- Alan DeKok <aland@ox.org>  Fri,  3 Jun 2005 11:29:34 -0700
 
 freeradius (1.0.2-0) unstable; urgency=low

diff --git a/debian/control b/debian/control
index 3c09508..abb6892 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: freeradius
-Build-Depends: debhelper (>= 4.1.68), libltdl3-dev, libpam0g-dev, postgresql-dev, libmysqlclient10-dev | libmysqlclient-dev, libgdbm-dev | libgdbmg1-dev, libldap2-dev, libsasl2-dev, libsnmp4.2-dev, libiodbc2-dev, libkrb5-dev, libssl-dev, libtool1.4 | libtool (< 1.5), snmp, autotools-dev
+Build-Depends: debhelper (>= 4.1.68), libltdl3-dev, libpam0g-dev, libpq-dev | postgresql-dev, libmysqlclient10-dev | libmysqlclient-dev, libgdbm-dev | libgdbmg1-dev, libldap2-dev, libsasl2-dev, libsnmp4.2-dev, libiodbc2-dev, libkrb5-dev, libssl-dev, libtool1.4 | libtool (< 1.5), snmp, autotools-dev
 Section: net
 Priority: optional
 Maintainer: Paul Hampson <Paul.Hampson@anu.edu.au>

diff --git a/debian/rules b/debian/rules
index 3a3ad3c..6ffc77a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,9 @@ build-simple stamp-build:
                --with-logdir=/var/log/$(package) \
                --with-thread-pool --with-system-libtool \
                --enable-ltdl-install=no --enable-strict-dependencies \
-               --enable-developer
+               --enable-developer \
+               --with-rlm-sql-postgresql-lib-dir=`pg_config --libdir` \
+               --with-rlm-sql-postgresql-include-dir=`pg_config --includedir`
        
        # Modify Make.inc for Debian...
        TEMPFILE=`mktemp /tmp/radmake-XXXXXX`; \
@@ -81,7 +83,7 @@ binary-arch: stamp-build
        test ! -d $(freeradius_dir)/var/log/radius/radacct || rmdir $(freeradius_dir)/var/log/radius/radacct
        test ! -d $(freeradius_dir)/var/log/radius || rmdir $(freeradius_dir)/var/log/radius
 #      Yuck! the makefile in doc/ does this.
-       rm -rf $(freeradius_dir)/usr/share/doc/freeradius-1.0.3
+       rm -rf $(freeradius_dir)/usr/share/doc/freeradius-1.0.4
 
        # split out inconvenient/controversal modules to other places
        for modname in krb5 ldap mysql postgresql iodbc; do \

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1698fa9..3a37170 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,4 @@
-FreeRADIUS 1.0.4 ; $Date$, urgency=medium
+FreeRADIUS 1.0.4 ; Date: 2005/06/11 22:46:52, urgency=medium
 
        * Fix installation problem.
        * Increase a buffer size, so radrelay doesn't truncate values.

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index d43599b..7445781 100644 (file)
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable RADIUS server
 URL: http://www.freeradius.org/
 Name: freeradius
-Version: 1.0.3
+Version: 1.0.4
 Release: 1
 License: GPL
 Group: Networking/Daemons

diff --git a/suse/freeradius.spec b/suse/freeradius.spec
index 58e0f76..613592f 100644 (file)
--- a/suse/freeradius.spec
+++ b/suse/freeradius.spec
@@ -17,7 +17,7 @@ License:      GPL, LGPL
 Group:        Productivity/Networking/Radius/Servers
 Provides:     radiusd
 Conflicts:    radiusd-livingston radiusd-cistron icradius
-Version:      1.0.3
+Version:      1.0.4
 Release:      1.suse
 URL:          http://www.freeradius.org/
 Summary:      Very highly Configurable Radius-Server