debian packaging fixes

- Remove disable-dhcp-by-default patch, as it's now disabled
  by default since 2662182b
- Refresh quilt patches

diff --git a/debian/patches/disable-dhcp-bydefault.diff b/debian/patches/disable-dhcp-bydefault.diff
deleted file mode 100644 (file)
index 7b42cac..0000000
--- a/debian/patches/disable-dhcp-bydefault.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/raddb/all.mk b/raddb/all.mk
---- a/raddb/all.mk
-+++ b/raddb/all.mk
-@@ -8,7 +8,7 @@ DEFAULT_SITES :=       default inner-tunnel
- LOCAL_SITES :=                $(addprefix raddb/sites-enabled/,$(DEFAULT_SITES))
- 
- DEFAULT_MODULES :=    always attr_filter cache_eap chap date \
--                      detail detail.log digest dhcp dynamic_clients eap \
-+                      detail detail.log digest dynamic_clients eap \
-                       echo exec expiration expr files linelog logintime \
-                       mschap ntlm_auth pap passwd preprocess radutmp realm \
-                       replicate soh sradutmp unix unpack utf8

diff --git a/debian/patches/radiusd-to-freeradius.diff b/debian/patches/radiusd-to-freeradius.diff
index d5762372805a8fa38576cab1c5bb1f81c756b5f8..7f3401918c9e2e0b20413eac1e89779e6152c5b9 100644 (file)
--- a/debian/patches/radiusd-to-freeradius.diff
+++ b/debian/patches/radiusd-to-freeradius.diff
@@ -1,6 +1,8 @@
---- a/Make.inc.in
-+++ b/Make.inc.in
-@@ -95,7 +95,7 @@
+Index: freeradius-server/Make.inc.in
+===================================================================
+--- freeradius-server.orig/Make.inc.in
++++ freeradius-server/Make.inc.in
+@@ -95,7 +95,7 @@ LDFLAGS              = $(OPENSSL_LDFLAGS) $(TALLOC_L
  
  LOGDIR                = ${logdir}
  RADDBDIR      = ${raddbdir}
@@ -9,9 +11,11 @@
  SBINDIR               = ${sbindir}
  RADIR         = ${radacctdir}
  LIBRADIUS     = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la $(TALLOC_LIBS)
---- a/raddb/radiusd.conf.in
-+++ b/raddb/radiusd.conf.in
-@@ -61,7 +61,7 @@
+Index: freeradius-server/raddb/radiusd.conf.in
+===================================================================
+--- freeradius-server.orig/raddb/radiusd.conf.in
++++ freeradius-server/raddb/radiusd.conf.in
+@@ -61,7 +61,7 @@ radacctdir = @radacctdir@
  
  #
  #  name of the running server.  See also the "-n" command-line option.
@@ -20,7 +24,7 @@
  
  #  Location of config and logfiles.
  confdir = ${raddbdir}
-@@ -436,8 +436,8 @@
+@@ -398,8 +398,8 @@ security {
        #  member.  This can allow for some finer-grained access
        #  controls.
        #
@@ -31,8 +35,10 @@
  
        #  Core dumps are a bad thing.  This should only be set to
        #  'yes' if you're debugging a problem with the server.
---- a/scripts/monit/freeradius.monitrc
-+++ b/scripts/monit/freeradius.monitrc
+Index: freeradius-server/scripts/monit/freeradius.monitrc
+===================================================================
+--- freeradius-server.orig/scripts/monit/freeradius.monitrc
++++ freeradius-server/scripts/monit/freeradius.monitrc
 @@ -8,9 +8,9 @@
  #  Totalmem limit should be lowered to 200.0 if none of the
  #  interpreted language modules or rlm_cache are being used.
@@ -46,9 +52,11 @@
     if failed host 127.0.0.1 port 1812 type udp protocol radius secret testing123 then alert
     if failed host 127.0.0.1 port 1813 type udp protocol radius secret testing123 then alert
     if cpu > 95% for 2 cycles then alert
---- a/raddb/sites-available/control-socket
-+++ b/raddb/sites-available/control-socket
-@@ -72,12 +72,12 @@
+Index: freeradius-server/raddb/sites-available/control-socket
+===================================================================
+--- freeradius-server.orig/raddb/sites-available/control-socket
++++ freeradius-server/raddb/sites-available/control-socket
+@@ -72,12 +72,12 @@ listen {
        #
        #  Name of user that is allowed to connect to the control socket.
        #
@@ -63,11 +71,11 @@
  
        #
        #  Access mode.
-diff --git a/src/main/radiusd.c b/src/main/radiusd.c
-index 1ae66ec..ee1a711 100644
---- a/src/main/radiusd.c
-+++ b/src/main/radiusd.c
-@@ -93,7 +93,6 @@ int main(int argc, char *argv[])
+Index: freeradius-server/src/main/radiusd.c
+===================================================================
+--- freeradius-server.orig/src/main/radiusd.c
++++ freeradius-server/src/main/radiusd.c
+@@ -97,7 +97,6 @@ int main(int argc, char *argv[])
        bool display_version = false;
        int flag = 0;
        int from_child[2] = {-1, -1};
@@ -75,7 +83,7 @@ index 1ae66ec..ee1a711 100644
        fr_state_t *state = NULL;
  
        /*
-@@ -128,13 +127,7 @@ int main(int argc, char *argv[])
+@@ -132,13 +131,7 @@ int main(int argc, char *argv[])
        main_config.myip.af = AF_UNSPEC;
        main_config.port = 0;
        main_config.daemonize = true;

diff --git a/debian/patches/series b/debian/patches/series
index 893d2d1716b329254cf0d3cf4bc3d503b5cc9a32..5ba2d18c5608c48b9de9e7fdec6aa98e8d5d2aab 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 radiusd-to-freeradius.diff
-disable-dhcp-bydefault.diff