Merge remote-tracking branch 'origin/upstream_release_3_0_13' into tr-integ-fr-3...

Merges the release_3_0_13 tag from upstream freeradius into a copy of the tr-integ branch.

diff --cc raddb/mods-available/realm
index 5a69e26,36825e0..12073ed
--- 1/raddb/mods-available/realm
--- 2/raddb/mods-available/realm
+++ b/raddb/mods-available/realm
@@@ -32,9 -32,10 +32,10 @@@ realm suffix 
        # The next 3 configuration items are valid ONLY
        # for a trust-router.  For all other realms,
        # they are ignored.
-       trust_router = "localhost"
-       rp_realm = "painless-security.com"
-       default_community = "apc.moonshot.ja.net"
+ #     trust_router = "localhost"
+ #     tr_port = 12309
 -#     rp_realm = "painless-security.com"
 -#     default_community = "apc.moonshot.ja.net"
++#     rp_realm = "realm.example.com"
++#     default_community = "apc.communities.example.com"
  }
  
  #  'username%realm'

diff --cc redhat/freeradius.spec-renamed
Simple merge

diff --cc src/main/tls.c
Simple merge

diff --cc src/main/tls_listen.c
Simple merge

diff --cc src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
Simple merge

diff --cc suse/freeradius.spec-renamed
Simple merge