Fix up the debian "freeradius" name patch... again.

diff --git a/debian/.gitignore b/debian/.gitignore
index 7125341c2e161258635c3f467b93a626c4b45f2f..51a2be39bfaee342bd83b1b357f70bacc17deb83 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -7,6 +7,7 @@ freeradius-mysql
 freeradius-postgresql
 freeradius-rest
 freeradius-utils
+freeradius-unixodbc
 freeradius-dhcp
 freeradius-memcached
 freeradius-redis
@@ -18,3 +19,5 @@ stamp-patched
 tmp
 files
 control
+freeradius.postinst.debhelper
+freeradius.postrm.debhelper

diff --git a/debian/patches/radiusd-to-freeradius.diff b/debian/patches/radiusd-to-freeradius.diff
index 04b8a310b309a95c49d5d227b3ad846b409cd631..c8c3725abea328d202aedacfd1799b1284c22651 100644 (file)
--- a/debian/patches/radiusd-to-freeradius.diff
+++ b/debian/patches/radiusd-to-freeradius.diff
@@ -1,6 +1,6 @@
 --- a/Make.inc.in
 +++ b/Make.inc.in
-@@ -98,7 +98,7 @@
+@@ -105,7 +105,7 @@
 
  LOGDIR                = ${logdir}
  RADDBDIR      = ${raddbdir}
@@ -20,7 +20,7 @@
 
  #  Location of config and logfiles.
  confdir = ${raddbdir}
-@@ -416,8 +416,8 @@
+@@ -397,8 +397,8 @@
        #  member.  This can allow for some finer-grained access
        #  controls.
        #
@@ -48,32 +48,39 @@
     if cpu > 95% for 2 cycles then alert
 --- a/raddb/sites-available/control-socket
 +++ b/raddb/sites-available/control-socket
-@@ -66,7 +66,7 @@ listen {
-       #
-       #  Name of group that is allowed to connect to the control socket.
-       #
--#     gid = radius
-+#     gid = freerad
+@@ -71,12 +71,12 @@ listen {
+                       #
+                       #  Name of user who is allowed to connect to the control socket.
+                       #
+-#                     uid = radius
++#                     uid = freerad
 
-       #
-       #  Access mode.
+                       #
+                       #  Name of group that is allowed to connect to the control socket.
+                       #
+-#                     gid = radius
++#                     gid = freerad
+
+                       #
+                       #  Access mode.
 --- a/src/bin/radiusd.c
 +++ b/src/bin/radiusd.c
-@@ -126,12 +126,11 @@ int main(int argc, char *argv[])
-       main_config.daemonize = true;
-       main_config.spawn_workers = true;
-
+@@ -231,13 +231,11 @@ int main(int argc, char *argv[])
+       /*
+        *      Set some default values
+-       */
 -      p = strrchr(argv[0], FR_DIR_SEP);
 -      if (!p) {
--              main_config.name = argv[0];
+-              main_config_name_set_default(config, argv[0], false);
 -      } else {
--              main_config.name = p + 1;
+-              main_config_name_set_default(config, p + 1, false);
 -      }
-+      /*
++       *
 +       *      Debian changes the binary name to "freeradius", but
 +       *      leaves the configuration file as "radiusd.conf".
 +       */
-+      main_config.name = "radiusd";
++      main_config_name_set_default(config, "radiusd", false);
+
+       config->daemonize = true;
+       config->spawn_workers = true;
 
-       /*
-        *      Don't put output anywhere until we get told a little

diff --git a/raddb/sites-available/control-socket b/raddb/sites-available/control-socket
index 0a22adcd338fb74b37e172667d4fa317f9d335e2..d4d1707b9273517171f073b69a0f1c936504aa5f 100644 (file)
--- a/raddb/sites-available/control-socket
+++ b/raddb/sites-available/control-socket
@@ -73,7 +73,6 @@ server control {
                        #
 #                      uid = radius
 
-
                        #
                        #  Name of group that is allowed to connect to the control socket.
                        #