Pull in unique hostname into Debian

Merge remote-tracking branch 'origin/tr-integ' into HEAD

diff --git a/debian/changelog b/debian/changelog
index 9880990..e62e1c9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+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
 
   * New upstream version.

diff --git a/debian/control b/debian/control
index a01b72e..4feb1e7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 6.0.7),
  libsasl2-dev,
  libiodbc2-dev,
  libkrb5-dev,
+ moonshot-trust-router-dev,
  libperl-dev,
  libpcap-dev,
   python-dev,
@@ -19,7 +20,8 @@ Build-Depends: debhelper (>= 6.0.7),
  libssl-dev,
  libtalloc-dev,
  libyubikey-dev,
- libsqlite3-dev
+ libsqlite3-dev,
+  openssl, libpcre3-dev
 Section: net
 Priority: optional
 Maintainer: Josip Rodin <joy-packages@debian.org>
@@ -29,10 +31,11 @@ Homepage: http://www.freeradius.org/
 
 Package: freeradius
 Architecture: any
-Depends: lsb-base (>= 3.1-23.2), ${shlibs:Depends}, freeradius-common, libfreeradius3 (= ${binary:Version}), ssl-cert, adduser
+Depends: lsb-base (>= 3.1-23.2), ${shlibs:Depends}, freeradius-common (>= 3.0~), libfreeradius3 (= ${binary:Version}), ssl-cert, adduser
 Provides: radius-server
 Recommends: freeradius-utils
 Suggests: freeradius-ldap, freeradius-postgresql, freeradius-mysql, freeradius-krb5
+Breaks: freeradius (<< 3)
 Description: a high-performance and highly configurable RADIUS server
  FreeRADIUS is a high-performance RADIUS server with support for:
   - many vendor-specific attributes

diff --git a/debian/freeradius-postgresql.postinst b/debian/freeradius-postgresql.postinst
index aedc5dd..9deab16 100755 (executable)
--- a/debian/freeradius-postgresql.postinst
+++ b/debian/freeradius-postgresql.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
   configure)
-        for file in `find /etc/freeradius/mods-config/sql/main/postgresql/ -print` 
+        for file in `find /etc/freeradius/mods-config/sql/main/postgresql -print` 
         do
           if ! dpkg-statoverride --list | grep -qw $file$; then
             dpkg-statoverride --add --update root freerad 0640 $file
@@ -20,9 +20,9 @@ case "$1" in
         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 --git a/debian/freeradius.examples b/debian/freeradius.examples
index 9121e4b..828038f 100644 (file)
--- a/debian/freeradius.examples
+++ b/debian/freeradius.examples
@@ -4,6 +4,7 @@ scripts/create-users.pl
 scripts/cryptpasswd
 scripts/cryptpasswd.in
 scripts/exec-program-wait
+scripts/min-includes.pl
 scripts/radiusd2ldif.pl
 scripts/radiusd.cron.daily
 scripts/radiusd.cron.daily.in

diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index 94b43a4..88e1f9a 100755 (executable)
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -30,7 +30,7 @@ case "$1" in
             /etc/freeradius/mods-config/preprocess/hints \
             /etc/freeradius/experimental.conf \
             /etc/freeradius/proxy.conf \
-            /etc/freeradius/clients.conf \
+            /etc/freeradius/clients.conf
           do
             if ! dpkg-statoverride --list | grep -qw $file$; then
               dpkg-statoverride --add --update root freerad 0640 $file

diff --git a/debian/freeradius.prerm b/debian/freeradius.prerm
index b0ddce1..055bfd2 100755 (executable)
--- a/debian/freeradius.prerm
+++ b/debian/freeradius.prerm
@@ -13,7 +13,7 @@ case "$1" in
         for file in /etc/freeradius/mods-config/files/pre-proxy \
           /etc/freeradius/mods-config/preprocess/huntgroups \
           /etc/freeradius/mods-config/preprocess/hints \
-          /etc/freeradius/mods-config/files/accounting
+          /etc/freeradius/mods-config/files/accounting \
           /etc/freeradius/experimental.conf \
           /etc/freeradius/proxy.conf \
           /etc/freeradius/clients.conf

diff --git a/debian/libfreeradius3.install b/debian/libfreeradius3.install
index 0eb4b91..8e49440 100644 (file)
--- a/debian/libfreeradius3.install
+++ b/debian/libfreeradius3.install
@@ -1,2 +1,3 @@
 usr/lib/freeradius/libfreeradius-radius.so
 usr/lib/freeradius/libfreeradius-eap.so
+usr/lib/freeradius/libfreeradius-server.so

diff --git a/debian/rules b/debian/rules
index 92b9b9b..25db31b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,6 @@ else
 endif
        ln -s /usr/share/misc/config.sub config.sub
        ln -s /usr/share/misc/config.guess config.guess
-       
 
        ./configure $(confflags) \
                --config-cache \
@@ -107,7 +106,7 @@ clean: unpatch
        rm -f build-arch-stamp build-indep-stamp 
        rm -f config.cache config.log
        rm -f src/freeradius-devel
-       
+
        [ ! -d src/modules/lib ] || rm -fr src/modules/lib || true
        [ ! -d src/binary ] || rm -fr src/binary || true
 
@@ -130,11 +129,12 @@ install: install-arch
 install-arch: build-arch-stamp
        dh_testdir
        dh_testroot
-       dh_installdirs -i
+       dh_installdirs 
        test -d $(freeradius_dir)/usr/lib/freeradius || mkdir -p $(freeradius_dir)/usr/lib/freeradius
        ln -fs rlm_sql.so $(freeradius_dir)/usr/lib/freeradius/librlm_sql.so
        $(MAKE) install R=$(freeradius_dir)
-       
+       (cd debian/tmp/etc/freeradius/certs&& $(MAKE) destroycerts)     
+
        # rename radius binary to play nicely with others
        mv $(freeradius_dir)/usr/sbin/radiusd $(freeradius_dir)/usr/sbin/$(package)
        mv $(freeradius_dir)/$(mandir)/man8/radiusd.8 $(freeradius_dir)/$(mandir)/man8/$(package).8

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)

diff --git a/raddb/all.mk b/raddb/all.mk
index 4521760..55beed1 100644 (file)
--- a/raddb/all.mk
+++ b/raddb/all.mk
@@ -94,15 +94,15 @@ $(R)$(raddbdir)/%: | raddb/%
 
 # Create symbolic links for legacy files
 $(R)$(raddbdir)/huntgroups: $(R)$(modconfdir)/preprocess/huntgroups
-       @[ -e $@ ] || lecho LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
+       @[ -e $@ ] || echo LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
        @[ -e $@ ] || ln -s $(patsubst $(R)$(raddbdir)/%,./%,$<) $@
 
 $(R)$(raddbdir)/hints: $(R)$(modconfdir)/preprocess/hints
-       @[ -e $@ ] || lecho LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
+       @[ -e $@ ] || echo LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
        @[ -e $@ ] || ln -s $(patsubst $(R)$(raddbdir)/%,./%,$<) $@
 
 $(R)$(raddbdir)/users: $(R)$(modconfdir)/files/authorize
-       @[ -e $@ ] || lecho LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
+       @[ -e $@ ] || echo LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@)
        @[ -e $@ ] || ln -s $(patsubst $(R)$(raddbdir)/%,./%,$<) $@
 
 $(LOCAL_CERT_PRODUCTS):

diff --git a/src/main/version.c b/src/main/version.c
index 4312acc..82d1f38 100644 (file)
--- a/src/main/version.c
+++ b/src/main/version.c
@@ -43,18 +43,6 @@ static long ssl_built = OPENSSL_VERSION_NUMBER;
  */
 int ssl_check_version(void)
 {
-       long ssl_linked;
-       
-       ssl_linked = SSLeay();
-       
-       if (ssl_linked != ssl_built) {
-               ERROR("libssl version mismatch."
-                      "  Built with: %lx\n  Linked: %lx",
-                      (unsigned long) ssl_built,
-                      (unsigned long) ssl_linked);
-       
-               return -1;
-       };
        
        return 0;
 }