Merge branch 'tr-upgrade' into debian-upgrade

Conflicts:
	debian/changelog
	debian/control
	debian/freeradius-postgresql.postinst
	src/main/version.c

diff --cc debian/changelog
index 430dabb,08e958e..1828607
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,73 -1,17 +1,86 @@@
 +freeradius (3.0.1+moonshot1-4) unstable; urgency=medium
 +
 +  * Package installation of freeradius-ldap and freeradius-mysql should
 +    not fail simply because the freeradius config is invalid
 +
 + -- Sam Hartman <hartmans@debian.org>  Fri, 23 May 2014 10:17:44 -0400
 +
 +freeradius (3.0.1+moonshot1-3) unstable; urgency=medium
 +
 +  * Update debian/rules to patch for build-arch builds
 +
 + -- Sam Hartman <hartmans@debian.org>  Mon, 24 Mar 2014 18:58:30 -0400
 +
 +freeradius (3.0.1+moonshot1-2) unstable; urgency=medium
 +
 +  * Update radius-to-freeradius name patch
 +
 + -- Sam Hartman <hartmans@debian.org>  Mon, 24 Mar 2014 13:08:25 -0400
 +
 +freeradius (3.0.1+moonshot1-1) unstable; urgency=low
 +
 +  [ Sam Hartman ]
 +  * New upstream
 +
 +  [ Margaret Wasserman ]
 +  * Upgrade to freeradius 3.0.1 plus patches to handle crash on incoming
 +    radsec packets.  
 +  * Allow configuration of trust_router port number in 
 +    mods-available/realm.
 +  * Packages produce significantly verbose timing output when freeradius
 +    is run with -fxx.
 +
 + -- Margaret Wasserman <margaret@moonshot-proxy>  Tue, 18 Mar 2014 17:48:52 -0400
 +
 +freeradius (3.0.0~rc0+git+moonshot1-6) unstable; urgency=low
 +
 +  * Update for allowing an RP to contact multiple IDPs
 +
 + -- Sam Hartman <hartmans@debian.org>  Mon, 16 Dec 2013 10:40:09 -0500
 +
 +freeradius (3.0.0~rc0+git+moonshot1-5) unstable; urgency=low
 +
 +  * Don't fail on duplicate IP
 +  * realms.c: don't segfault on trustrouter result
 +  * version.c: remove ssl version check
 +
 + -- Sam Hartman <hartmans@debian.org>  Tue, 26 Nov 2013 09:39:08 -0500
 +
 +freeradius (3.0.0~rc0+git+moonshot1-3) unstable; urgency=low
 +
 +  * Include channel binding fixes
 +
 + -- Sam Hartman <hartmans@debian.org>  Thu, 26 Sep 2013 15:33:07 -0400
 +
 +freeradius (3.0.0~rc0+git+moonshot1-2) unstable; urgency=low
 +
 +  * Update block fix
 +
 + -- Sam Hartman <hartmans@debian.org>  Fri, 20 Sep 2013 14:48:10 -0400
 +
 +freeradius (3.0.0~rc0+git+moonshot1-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Sam Hartman <hartmans@debian.org>  Tue, 13 Aug 2013 15:44:57 -0400
 +
 +freeradius (3.0.0git+dfsg-1) unstable; urgency=medium
++
+ freeradius (3.0.3+git) unstable; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Alan DeKok <aland@freeradius.org>  Fri, 21 Mar 2014 08:30:00 -0400
+ 
+ freeradius (3.0.2+git) unstable; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Alan DeKok <aland@freeradius.org>  Wed, 15 Jan 2014 21:23:14 -0400
+ 
  freeradius (3.0.1+git) unstable; urgency=medium
  
 +
    * New upstream version.
  
   -- Alan DeKok <aland@freeradius.org>  Mon, 10 Oct 2013 21:23:14 -0400

diff --cc debian/control
index 658c0f2,bd3a400..0591afe
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,24 -3,25 +3,28 @@@ Build-Depends: debhelper (>= 7.4)
   quilt,
   dpkg-dev (>= 1.13.19),
   autotools-dev,
-  libpam0g-dev,
-  libmysqlclient-dev,
-  libsqlite3-dev,
+  libcurl4-openssl-dev,
   libgdbm-dev,
-  libldap2-dev,
-  libsasl2-dev,
   libiodbc2-dev,
+  libjson0,
+  libjson0-dev,
   libkrb5-dev,
 + moonshot-trust-router-dev (>= 1.2),
 + openssl,
 + libperl-dev,
+  libldap2-dev,
+  libpam0g-dev,
   libpcap-dev,
-  python-dev,
-  libreadline-dev,
+  libperl-dev,
+  libmysqlclient-dev,
   libpq-dev,
+  libreadline-dev,
+  libsasl2-dev,
+  libsqlite3-dev,
   libssl-dev,
   libtalloc-dev,
-  libyubikey-dev
+  libyubikey-dev,
+  python-dev
  Section: net
  Priority: optional
  Maintainer: Josip Rodin <joy-packages@debian.org>

diff --cc debian/freeradius-mysql.postinst
index 2021b5b,1b074d9..f8a9e0e
--- 1/debian/freeradius-mysql.postinst
--- 2/debian/freeradius-mysql.postinst
+++ b/debian/freeradius-mysql.postinst
@@@ -4,25 -4,10 +4,10 @@@ set -
  
  case "$1" in
    configure)
-         for file in `find /etc/freeradius/mods-config/sql/main/mysql/ -print`
-         do
-           if ! dpkg-statoverride --list | grep -qw $file$; then
-             dpkg-statoverride --add --update root freerad 0640 $file
-           fi
-         done
- 
-         for dir in /etc/freeradius/mods-config/sql/main \
-           /etc/freeradius/mods-config/sql/main/mysql
-         do
-           if ! dpkg-statoverride --list | grep -qw $dir$; then
-             dpkg-statoverride --add --update root freerad 2751 $dir
-           fi
-         done
- 
          if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
 -          invoke-rc.d freeradius force-reload
 +          invoke-rc.d freeradius force-reload || true
          else
 -          /etc/init.d/freeradius force-reload
 +          /etc/init.d/freeradius force-reload || true
          fi
        ;;
  esac

diff --cc src/main/version.c
index ffa37de,fb72c86..61d52a5
--- 1/src/main/version.c
--- 2/src/main/version.c
+++ b/src/main/version.c
@@@ -41,8 -42,20 +42,8 @@@ static long ssl_built = OPENSSL_VERSION
   *
   * @return 0 if ok, else -1
   */
- int ssl_check_version(void)
+ int ssl_check_consistency(void)
  {
 -      long ssl_linked;
 -
 -      ssl_linked = SSLeay();
 -
 -      if (ssl_linked != ssl_built) {
 -              ERROR("libssl version mismatch.  built: %lx linked: %lx",
 -                     (unsigned long) ssl_built,
 -                     (unsigned long) ssl_linked);
 -
 -              return -1;
 -      };
 -
        return 0;
  }