rpm/dhcp
SHA256
1
0
Fork 0
forked from pool/dhcp
Code Pull Requests Activity

Accepting request 714701 from home:1Antoine1:branches:network:dhcp

Browse Source 
- Remove SuSEfirewall2 services since SuSEfirewall2 has been
  replaced by firewalld (which already provides a service for
  dhcp).

See also https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html.

OBS-URL: https://build.opensuse.org/request/show/714701
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=196
This commit is contained in:
Reinhard Max 2019-07-22 10:30:41 +00:00 committed by Git OBS Bridge
parent 1507a05c01
commit 12116240fb
4 changed files with 7 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SuSEfirewall2.dhcp-server
View File

@ -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"

22
SuSEfirewall2.dhcp6-server
View File

@ -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=""

7
dhcp.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jul 11 18:13:36 UTC 2019 - Antoine Belvire <antoine.belvire@opensuse.org>
- 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 <dimstar@opensuse.org>

11
dhcp.spec
View File

@ -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}