commit 035872d4acebe1bb1b10ed6e530cb7c47cdc0141
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Tue Jan 31 17:31:18 2012 +0100
revert previous change (#782499) + remove sysvinit scriptlets
dhcp-4.2.0-CLOEXEC.patch | 422 --------------------------------
dhcp-4.2.1-P1-CVE-2011-0997.patch | 16 --
dhcp-4.2.1-invalid-dhclient-conf.patch | 12 -
dhcp.spec | 42 +---
dhcpd.service | 3 +-
dhcpd6.service | 3 +-
6 files changed, 7 insertions(+), 491 deletions(-)
---
diff --git a/dhcp.spec b/dhcp.spec
index a219fec..f13783a 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -22,7 +22,7 @@
Summary: Dynamic host configuration protocol software
Name: dhcp
Version: 4.2.3
-Release: 14.%{patchver}%{?dist}
+Release: 15.%{patchver}%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was.
@@ -89,15 +89,9 @@ BuildRequires: systemtap-sdt-devel
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires(pre): shadow-utils
-Requires(post): chkconfig
Requires(post): coreutils
Requires(post): systemd-units
-# This is actually needed for the %%triggerun script but Requires(triggerun) is not valid.
-Requires(post): systemd-sysv
-Requires(preun): chkconfig
-Requires(preun): initscripts
Requires(preun): systemd-units
-Requires(postun): initscripts
Requires(postun): systemd-units
# In _docdir we ship some perl scripts and module from contrib subdirectory.
@@ -168,14 +162,6 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Header files and API documentation for using the ISC DHCP libraries. The
libdhcpctl and libomapi static libraries are also included in this package.
-%package sysvinit
-Summary: Legacy SysV initscripts for DHCP server and relay agent
-Group: System Environment/Base
-
-%description sysvinit
-Legacy SysV initscripts for init mechanisms such as upstart
-which do not support the systemd unit file format.
-
%prep
%setup -q -n dhcp-%{VERSION}
@@ -552,28 +538,6 @@ fi
%postun libs -p /sbin/ldconfig
-%triggerun -- dhcp < 12:4.2.0-21.P1
-# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply dhcpd
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save dhcpd >/dev/null 2>&1 ||:
-/usr/bin/systemd-sysv-convert --save dhcpd6 >/dev/null 2>&1 ||:
-/usr/bin/systemd-sysv-convert --save dhcrelay >/dev/null 2>&1 ||:
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del dhcpd >/dev/null 2>&1 || :
-/sbin/chkconfig --del dhcpd6 >/dev/null 2>&1 || :
-/sbin/chkconfig --del dhcrelay >/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 || :
-
-%triggerpostun -n dhcp-sysvinit -- dhcp < 12:4.2.0-21.P1
-# https://fedoraproject.org/wiki/Packaging:SysVInitScript#Initscripts_in_addition_to_systemd_unit_files
-/sbin/chkconfig --add dhcpd >/dev/null 2>&1 || :
-/sbin/chkconfig --add dhcpd6 >/dev/null 2>&1 || :
-/sbin/chkconfig --add dhcrelay >/dev/null 2>&1 || :
-
%files
%doc dhcpd.conf.sample dhcpd6.conf.sample
%doc contrib/*
@@ -643,6 +607,10 @@ fi
%changelog
+* Tue Jan 31 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.3-15.P2
+- revert previous change (#782499)
+- remove the rest of the sysvinit scriptlets
+
* Tue Jan 17 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.3-14.P2
- use PrivateTmp=true in service files (#782499)
diff --git a/dhcpd.service b/dhcpd.service
index 8cc1420..487289d 100644
--- a/dhcpd.service
+++ b/dhcpd.service
@@ -4,8 +4,7 @@ After=syslog.target network.target
[Service]
EnvironmentFile=/etc/sysconfig/dhcpd
-ExecStart=/usr/sbin/dhcpd -d -user dhcpd -group dhcpd --no-pid $DHCPDARGS
-PrivateTmp=true
+ExecStart=/usr/sbin/dhcpd -f -user dhcpd -group dhcpd --no-pid $DHCPDARGS
[Install]
WantedBy=multi-user.target
diff --git a/dhcpd6.service b/dhcpd6.service
index 8621eca..ba44783 100644
--- a/dhcpd6.service
+++ b/dhcpd6.service
@@ -4,8 +4,7 @@ After=syslog.target network.target
[Service]
EnvironmentFile=/etc/sysconfig/dhcpd6
-ExecStart=/usr/sbin/dhcpd -d -6 -cf /etc/dhcp/dhcpd6.conf -user dhcpd -group dhcpd --no-pid $DHCPDARGS
-PrivateTmp=true
+ExecStart=/usr/sbin/dhcpd -f -6 -cf /etc/dhcp/dhcpd6.conf -user dhcpd -group dhcpd --no-pid $DHCPDARGS
[Install]
WantedBy=multi-user.target