From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 8 Mar 2024 21:03:21 +0000 (-0600)
Subject: Remove DHCP package from debian packaging
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40707a4d695763af5d1a4ec374aff3305ce53bf7;p=thirdparty%2Ffreeradius-server.git

Remove DHCP package from debian packaging

it has no external dependencies, and we need the libraries to load the dictionaries
---

diff --git a/debian/.gitignore b/debian/.gitignore
index 51a2be39bfa..4393d7798f6 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -8,7 +8,6 @@ freeradius-postgresql
 freeradius-rest
 freeradius-utils
 freeradius-unixodbc
-freeradius-dhcp
 freeradius-memcached
 freeradius-redis
 freeradius-yubikey
diff --git a/debian/control.in b/debian/control.in
index d2edd1ac8fc..c4013b87f01 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -127,13 +127,6 @@ Description: FreeRADIUS shared library development files
  .
  This package contains the development headers and static library version.
 
-Package: freeradius-dhcp
-Architecture: any
-Depends: freeradius (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${dist:Depends}
-Description: DHCP module for FreeRADIUS server
- The FreeRADIUS server can act as a DHCP server, and this module
- is necessary for that.
-
 Package: freeradius-brotli
 Architecture: any
 Depends: freeradius (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${dist:Depends}
diff --git a/debian/freeradius-dhcp.install b/debian/freeradius-dhcp.install
deleted file mode 100644
index 74c69386a90..00000000000
--- a/debian/freeradius-dhcp.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/freeradius/rlm_dhcp*.so
-usr/lib/freeradius/proto_dhcp*.so
-usr/lib/freeradius/process_dhcp*.so
-usr/lib/freeradius/libfreeradius-dhcp*.so
-usr/bin/dhcpclient
diff --git a/debian/freeradius-dhcp.lintian-overrides b/debian/freeradius-dhcp.lintian-overrides
deleted file mode 100644
index dd30c857c0f..00000000000
--- a/debian/freeradius-dhcp.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# There's plenty in the description of this package to identify
-# what it does.
-freeradius-dhcp: extended-description-is-probably-too-short
diff --git a/debian/freeradius-dhcp.postinst b/debian/freeradius-dhcp.postinst
deleted file mode 100644
index 8757a70b415..00000000000
--- a/debian/freeradius-dhcp.postinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-  configure)
-        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-          invoke-rc.d freeradius force-reload || true
-        else
-          /etc/init.d/freeradius force-reload
-        fi
-        ;;
-  abort-upgrade)
-        ;;
-  abort-remove)
-        ;;
-  abort-deconfigure)
-        ;;
-esac
-
-#DEBHELPER#
-
diff --git a/debian/freeradius-utils.install b/debian/freeradius-utils.install
index 6cd518246c7..4b9a9d53229 100644
--- a/debian/freeradius-utils.install
+++ b/debian/freeradius-utils.install
@@ -1,3 +1,4 @@
+usr/bin/dhcpclient
 usr/bin/smbencrypt
 usr/bin/radclient
 usr/bin/radict
diff --git a/debian/libfreeradius4.install b/debian/libfreeradius4.install
index d3864c53e76..b6f5ca65387 100644
--- a/debian/libfreeradius4.install
+++ b/debian/libfreeradius4.install
@@ -2,6 +2,8 @@ usr/lib/freeradius/libfreeradius-arp.so
 usr/lib/freeradius/libfreeradius-bfd.so
 usr/lib/freeradius/libfreeradius-bio.so
 usr/lib/freeradius/libfreeradius-control.so
+usr/lib/freeradius/libfreeradius-dhcpv4.so
+usr/lib/freeradius/libfreeradius-dhcpv6.so
 usr/lib/freeradius/libfreeradius-dns.so
 usr/lib/freeradius/libfreeradius-eap-aka-sim.so
 usr/lib/freeradius/libfreeradius-eap.so