diff --git a/SuSEfirewall2.dhcp-server b/SuSEfirewall2.dhcp-server deleted file mode 100644 index 5b77b26..0000000 --- a/SuSEfirewall2.dhcp-server +++ /dev/null @@ -1,22 +0,0 @@ -## Name: DHCPv4 Server -## Description: Opens ports for DHCPv4 Server. -# -# For a more detailed description of the individual variables see -# the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2 -# - -# space separated list of allowed TCP ports -TCP="" - -# space separated list of allowed UDP ports -UDP="bootps" - -# space separated list of allowed RPC services -RPC="" - -# space separated list of allowed IP protocols -IP="" - -# space separated list of allowed UDP broadcast ports -BROADCAST="bootps" - diff --git a/SuSEfirewall2.dhcp6-server b/SuSEfirewall2.dhcp6-server deleted file mode 100644 index 36b0a2f..0000000 --- a/SuSEfirewall2.dhcp6-server +++ /dev/null @@ -1,22 +0,0 @@ -## Name: DHCPv6 Server -## Description: Opens UDP port for DHCPv6 Server. -# -# For a more detailed description of the individual variables see -# the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2 -# - -# space separated list of allowed TCP ports -TCP="" - -# space separated list of allowed UDP ports -UDP="dhcpv6-server" - -# space separated list of allowed RPC services -RPC="" - -# space separated list of allowed IP protocols -IP="" - -# space separated list of allowed UDP broadcast ports -BROADCAST="" - diff --git a/dhcp.changes b/dhcp.changes index f23cb08..32c6485 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 11 18:13:36 UTC 2019 - Antoine Belvire + +- Remove SuSEfirewall2 services since SuSEfirewall2 has been + replaced by firewalld (which already provides a service for + dhcp). + ------------------------------------------------------------------- Fri May 10 09:06:07 UTC 2019 - Dominique Leuenberger diff --git a/dhcp.spec b/dhcp.spec index 0585b10..230062d 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -17,7 +17,6 @@ %define isc_version 4.3.6-P1 -%define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates @@ -50,9 +49,6 @@ Source23: dhcpd6.conf Source26: sysconfig.syslog-dhcpd Source27: dhclient-script # -Source32: SuSEfirewall2.dhcp-server -Source33: SuSEfirewall2.dhcp6-server -# Source41: dhcp.README Source43: DDNS-howto.txt Source44: contrib.tar.gz @@ -273,7 +269,6 @@ bash -n $RPM_SOURCE_DIR/dhclient-script # directories install -d -m0755 %{buildroot}/sbin install -d -m0755 %{buildroot}%{_sysconfdir}/dhcpd{,6}.d -install -d -m0755 %{buildroot}/%{susefw2dir} install -d -m0755 %{buildroot}%{_sysconfdir}/openldap/schema install -d -m0755 %{buildroot}%{_localstatedir}/run install -d -m0755 %{buildroot}%{_fillupdir} @@ -347,10 +342,6 @@ install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcrelay \ # another config files and scripts install -m0644 contrib/ldap/dhcp.schema \ %{buildroot}%{_sysconfdir}/openldap/schema -install -m0644 $RPM_SOURCE_DIR/SuSEfirewall2.dhcp-server \ - %{buildroot}/%{susefw2dir}/dhcp-server -install -m0644 $RPM_SOURCE_DIR/SuSEfirewall2.dhcp6-server \ - %{buildroot}/%{susefw2dir}/dhcp6-server install -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d install -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig/network/scripts install -m0755 $RPM_SOURCE_DIR/if-up.d.dhcpd-restart-hook \ @@ -453,8 +444,6 @@ test -e %{_localstatedir}/lib/dhcp6/dhclient6.leases || \ %files %license LICENSE -%config %{susefw2dir}/dhcp-server -%config %{susefw2dir}/dhcp6-server %{_bindir}/omshell %{_mandir}/man1/omshell.1%{?ext_man} %{_mandir}/man5/dhcp-eval.5%{?ext_man}