]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
dhcp: Drop package
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Feb 2023 13:53:18 +0000 (13:53 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Feb 2023 13:53:18 +0000 (13:53 +0000)
This is now EOL: https://www.isc.org/blogs/isc-dhcp-eol/

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
dhcp/dhcp.nm [deleted file]
dhcp/systemd/dhclient4@.service [deleted file]
dhcp/systemd/dhclient6@.service [deleted file]
dhcp/systemd/dhcpd.service [deleted file]
dhcp/systemd/dhcpd6.service [deleted file]
dhcp/systemd/dhcrelay.service [deleted file]
network/network.nm

diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm
deleted file mode 100644 (file)
index f001d96..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
-###############################################################################
-
-name       = dhcp
-version    = 4.4.3-P1
-release    = 1
-
-groups     = Networking/Daemons
-url        = https://www.isc.org/dhcp/
-license    = ISC
-summary    = Dynamic host configuration protocol software
-
-description
-       DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
-       individual devices on an IP network to get their own network
-       configuration information (IP address, subnetmask, broadcast address,
-       etc.) from a DHCP server. The overall purpose of DHCP is to make it
-       easier to administer a large network.
-end
-
-source_dl  = https://downloads.isc.org/isc/dhcp/%{version}/
-
-build
-       requires
-               groff
-               openldap-devel
-               libcap-ng-devel
-               systemd-devel
-       end
-
-       #CFLAGS += -fno-strict-aliasing
-
-       #PARALLELISMFLAGS = # No parallel build.
-
-       configure_options += \
-               --sysconfdir=%{sysconfdir}/dhcp \
-               --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases \
-               --with-srv6-lease-file=/var/lib/dhcpd/dhcpd6.leases \
-               --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
-               --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases \
-               --with-srv-pid-file=/run/dhcpd.pid \
-               --with-srv6-pid-file=/run/dhcpd6.pid \
-               --with-cli-pid-file=/run/dhclient.pid \
-               --with-cli6-pid-file=/run/dhclient6.pid \
-               --with-relay-pid-file=/run/dhcrelay.pid \
-               --with-ldap \
-               --with-ldapcrypto \
-               --disable-static \
-               --enable-paranoia \
-               --enable-early-chroot \
-               --enable-binary-leases \
-               --with-systemd
-
-       install_cmds
-               rm -vf %{BUILDROOT}%{sysconfdir}/dhcp/dhclient.conf
-
-               # Create runtime folders.
-               mkdir -pv %{BUILDROOT}/var/lib/dhclient
-               mkdir -pv %{BUILDROOT}/var/lib/dhcpd
-
-               # Create empty lease files.
-               touch %{BUILDROOT}/var/lib/dhclient/dhclient.leases
-               touch %{BUILDROOT}/var/lib/dhclient/dhclient6.leases
-               touch %{BUILDROOT}/var/lib/dhcpd/dhcpd.leases
-               touch %{BUILDROOT}/var/lib/dhcpd/dhcpd6.leases
-       end
-end
-
-packages
-       package %{name}
-               requires
-                       dhcp-common = %{thisver}
-                       /usr/lib/network/helpers/dhcpd-config-helper
-               end
-
-               prerequires += shadow-utils
-
-               configfiles
-                       %{sysconfdir}/dhcp
-               end
-
-               script prein
-                       getent group dhcpd >/dev/null || groupadd -r dhcpd
-                       getent passwd dhcpd >/dev/null || \
-                               useradd -r -g dhcpd -d /var/lib/dhcpd -s /sbin/nologin \
-                               -c "User for the DHCP server" dhcpd
-               end
-
-               # Just search for new unit files that were just installed.
-               script postin
-                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-               # Disable the service that is to be removed and stop it if it is still running.
-               script preun
-                       /bin/systemctl --no-reload disable dhcpd.service >/dev/null 2>&1 || :
-                       /bin/systemctl --no-reload disable dhcpd6.service >/dev/null 2>&1 || :
-                       /bin/systemctl --no-reload disable dhcrelay.service >/dev/null 2>&1 || :
-                       /bin/systemctl stop dhcpd.service >/dev/null 2>&1 || :
-                       /bin/systemctl stop dhcpd6.service >/dev/null 2>&1 || :
-                       /bin/systemctl stop dhcrelay.service >/dev/null 2>&1 || :
-               end
-
-               # Just tell systemd that unitfiles have been removed.
-               script postun
-                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-               # Try to restart the service if it is running.
-               script postup
-                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-                       /bin/systemctl try-restart dhcpd.service >/dev/null 2>&1 || :
-                       /bin/systemctl try-restart dhcpd6.service >/dev/null 2>&1 || :
-                       /bin/systemctl try-restart dhcrelay.service >/dev/null 2>&1 || :
-               end
-       end
-
-       package dhclient
-               summary = DHCP client daemon and dhclient-script.
-               description = %{summary}
-
-               requires
-                       dhcp-common = %{thisver}
-                       %{sbindir}/dhclient-script
-               end
-
-               files
-                       %{unitdir}/dhclient*.service
-                       %{sbindir}/dhclient
-                       /usr/share/man/man5/dhclient*
-                       /usr/share/man/man8/dhclient*
-                       /var/lib/dhclient
-               end
-
-               script postin
-                       systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-               script postun
-                       systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-               script postup
-                       systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-       end
-
-       package %{name}-common
-               summary = Common files used by the dhcp client and server.
-               description = %{summary}
-
-               files
-                       /usr/bin/
-                       /usr/share/man/man1/omshell.1*
-                       /usr/share/man/man5/dhcp-options.5*
-                       /usr/share/man/man5/dhcp-eval.5*
-               end
-       end
-
-       package %{name}-devel
-               template DEVEL
-       end
-
-       package %{name}-debuginfo
-               template DEBUGINFO
-       end
-end
diff --git a/dhcp/systemd/dhclient4@.service b/dhcp/systemd/dhclient4@.service
deleted file mode 100644 (file)
index d7023c8..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=DHCP client daemon for IPv4 on %I
-BindTo=dev-%I.device
-After=dev-%I.device
-
-[Service]
-Restart=on-failure
-ExecStartPre=/usr/lib/network/dhclient-helper start %I ipv4
-ExecStart=/usr/sbin/dhclient -d %I -4 \
-       -cf /run/network/dhclient/%I/dhclient4.conf \
-       -lf /var/lib/dhclient/dhclient-%I.leases \
-       -pf /run/network/dhclient/%I/dhclient4.pid
-ExecStop=/usr/lib/network/dhclient-helper stop %I ipv4
-
-# This could be used if you want to release a lease.
-#ExecStop=/usr/sbin/dhclient -d -r %I -4 \
-#      -cf /run/network/dhclient/%I/dhclient4.conf \
-#      -lf /var/lib/dhclient/dhclient-%I.leases \
-#      -pf /run/network/dhclient/%I/dhclient4.pid
-
-UtmpIdentifier=%I
diff --git a/dhcp/systemd/dhclient6@.service b/dhcp/systemd/dhclient6@.service
deleted file mode 100644 (file)
index 34f20a2..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=DHCP client daemon for IPv6 on %I
-
-[Service]
-Restart=on-failure
-ExecStartPre=/usr/lib/network/dhclient-helper start %I ipv6
-ExecStart=/usr/sbin/dhclient -d %I -6 -P -N \
-       -cf /run/network/dhclient/%I/dhclient6.conf \
-       -lf /var/lib/dhclient/dhclient6-%I.leases \
-       -pf /run/network/dhclient/%I/dhclient6.pid
-ExecStop=/usr/lib/network/dhclient-helper stop %I ipv6
-
-# This could be used if you want to release a lease.
-#ExecStop=/usr/sbin/dhclient -d -r %I -6 \
-#      -cf /run/network/dhclient/%I/dhclient6.conf \
-#      -lf /var/lib/dhclient/dhclient6-%I.leases \
-#      -pf /run/network/dhclient/%I/dhclient6.pid
-
-UtmpIdentifier=%I
diff --git a/dhcp/systemd/dhcpd.service b/dhcp/systemd/dhcpd.service
deleted file mode 100644 (file)
index d2fdd03..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCPv4 Server Daemon
-After=network.target
-
-[Service]
-ExecStartPre=/usr/lib/network/helpers/dhcpd-config-helper create ipv4
-ExecStart=/usr/sbin/dhcpd -d -cf /etc/dhcp/dhcpd.conf -user dhcpd -group dhcpd --no-pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dhcp/systemd/dhcpd6.service b/dhcp/systemd/dhcpd6.service
deleted file mode 100644 (file)
index 54e4c27..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCPv6 Server Daemon
-After=network.target
-
-[Service]
-ExecStartPre=/usr/lib/network/helpers/dhcpd-config-helper create ipv6
-ExecStart=/usr/sbin/dhcpd -d -6 -cf /etc/dhcp/dhcpd6.conf -user dhcpd -group dhcpd --no-pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dhcp/systemd/dhcrelay.service b/dhcp/systemd/dhcrelay.service
deleted file mode 100644 (file)
index d47bf63..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=DHCP Relay Agent Daemon
-After=syslog.target network.target
-
-[Service]
-ExecStart=/usr/sbin/dhcrelay -d --no-pid
-
-[Install]
-WantedBy=multi-user.target
index 82b51de7998d18ef090c5930795cdf818bdf0dfb..cd7825749eadd7ec2c3d40af0f890fa35148cc04 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = network
 version    = 010
-release    = 4
+release    = 4.1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Base Networking/Tools
@@ -50,7 +50,6 @@ packages
                        bird >= 2
                        curl
                        dhclient >= 4.2.4-2
-                       dhcp >= 4.2.4-1
                        ebtables
                        hostapd
                        initscripts >= 1:2.99-18