From 3f8c5eab9157cd1656bb5e70bd8f994a2618961d Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Thu, 18 Nov 2010 14:10:52 +0100
Subject: Releng, version is radsecproxy-1.4-dev.

---
 ChangeLog    |  4 ++++
 README       |  2 +-
 configure    | 20 ++++++++++----------
 configure.ac |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e55e64..59daf5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,3 +87,7 @@
 	  older than 1.0.0b to mitigate possible effects of
 	  http://openssl.org/news/secadv_20101116.txt (RADSECPROXY-14).
 	- Crash bug when reading improper config file fixed.
+2010-11-18 1.4-dev
+	Bug fixes:
+	- Don't disable OpenSSL session caching for 0.9.8p and newer in
+	  the 0.9.x track.
diff --git a/README b/README
index 8a07227..42117df 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is radsecproxy 1.4.1 from November 17 2010.
+This is radsecproxy 1.4-dev, not yet released.
 
 radsecproxy is a generic RADIUS proxy that supports both UDP and TLS
 (RadSec) RADIUS transports.  There is also experimental support for
diff --git a/configure b/configure
index b265d19..b1b4da7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for radsecproxy 1.4.1.
+# Generated by GNU Autoconf 2.65 for radsecproxy 1.4-dev.
 #
 # Report bugs to <radsecproxy@uninett.no>.
 #
@@ -551,8 +551,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='radsecproxy'
 PACKAGE_TARNAME='radsecproxy'
-PACKAGE_VERSION='1.4.1'
-PACKAGE_STRING='radsecproxy 1.4.1'
+PACKAGE_VERSION='1.4-dev'
+PACKAGE_STRING='radsecproxy 1.4-dev'
 PACKAGE_BUGREPORT='radsecproxy@uninett.no'
 PACKAGE_URL=''
 
@@ -1217,7 +1217,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures radsecproxy 1.4.1 to adapt to many kinds of systems.
+\`configure' configures radsecproxy 1.4-dev to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1288,7 +1288,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of radsecproxy 1.4.1:";;
+     short | recursive ) echo "Configuration of radsecproxy 1.4-dev:";;
    esac
   cat <<\_ACEOF
 
@@ -1385,7 +1385,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-radsecproxy configure 1.4.1
+radsecproxy configure 1.4-dev
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1440,7 +1440,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by radsecproxy $as_me 1.4.1, which was
+It was created by radsecproxy $as_me 1.4-dev, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2358,7 +2358,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='radsecproxy'
- VERSION='1.4.1'
+ VERSION='1.4-dev'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4252,7 +4252,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by radsecproxy $as_me 1.4.1, which was
+This file was extended by radsecproxy $as_me 1.4-dev, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4309,7 +4309,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-radsecproxy config.status 1.4.1
+radsecproxy config.status 1.4-dev
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 17cf9ea..ea86df8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(radsecproxy, 1.4.1, radsecproxy@uninett.no)
+AC_INIT(radsecproxy, 1.4-dev, radsecproxy@uninett.no)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_PROG_CC
-- 
cgit v1.1