[xinetd] drop sysconfig-related stuff
jsynacek
jsynacek at fedoraproject.org
Mon Feb 24 14:14:16 UTC 2014
commit 333ba8c787c51db5ff49cdf27173cb2258813a21
Author: Jan Synacek <jsynacek at redhat.com>
Date: Mon Feb 24 15:06:51 2014 +0100
drop sysconfig-related stuff
xinetd.init | 156 --------------------------------------------------------
xinetd.service | 3 +-
xinetd.spec | 12 ++---
3 files changed, 6 insertions(+), 165 deletions(-)
---
diff --git a/xinetd.service b/xinetd.service
index 20efb2c..8ab0535 100644
--- a/xinetd.service
+++ b/xinetd.service
@@ -5,8 +5,7 @@ After=syslog.target network.target
[Service]
Type=forking
PIDFile=/var/run/xinetd.pid
-EnvironmentFile=-/etc/sysconfig/xinetd
-ExecStart=/usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid "$EXTRAOPTIONS"
+ExecStart=/usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid
ExecReload=/usr/bin/kill -HUP $MAINPID
[Install]
diff --git a/xinetd.spec b/xinetd.spec
index 301df54..cd66b40 100644
--- a/xinetd.spec
+++ b/xinetd.spec
@@ -1,7 +1,7 @@
Summary: A secure replacement for inetd
Name: xinetd
Version: 2.3.15
-Release: 12%{?dist}
+Release: 13%{?dist}
License: xinetd
Group: System Environment/Daemons
Epoch: 2
@@ -10,7 +10,6 @@ URL: https://github.com/xinetd-org/xinetd
# https://github.com/xinetd-org/xinetd/archive/xinetd-2-3-15.tar.gz
Source: xinetd-%{version}.tar.gz
Source1: xinetd.service
-Source3: xinetd.sysconf
Patch0: xinetd-2.3.15-pie.patch
Patch4: xinetd-2.3.14-bind-ipv6.patch
Patch6: xinetd-2.3.14-man-section.patch
@@ -69,7 +68,7 @@ Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
%{!?tcp_wrappers:BuildRequires: tcp_wrappers-devel}
-Requires: filesystem >= 2.0.1, initscripts, setup, fileutils
+Requires: filesystem >= 2.0.1, setup, fileutils
Provides: inetd
@@ -142,9 +141,6 @@ rm -f $RPM_BUILD_ROOT/usr/sbin/itox
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/xconv.pl*
rm -f $RPM_BUILD_ROOT/usr/sbin/xconv.pl
-mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-install -m 600 %SOURCE3 $RPM_BUILD_ROOT/etc/sysconfig/xinetd
-
%post
%systemd_post xinetd.service
@@ -157,13 +153,15 @@ install -m 600 %SOURCE3 $RPM_BUILD_ROOT/etc/sysconfig/xinetd
%files
%doc CHANGELOG COPYRIGHT README xinetd/sample.conf contrib/empty.conf
%config(noreplace) /etc/xinetd.conf
-%config(noreplace) /etc/sysconfig/xinetd
%{_unitdir}/xinetd.service
%config(noreplace) /etc/xinetd.d/*
/usr/sbin/xinetd
%{_mandir}/*/*
%changelog
+* Mon Feb 24 2014 Jan Synáček <jsynacek at redhat.com> - 2:2.3.15-13
+- drop sysconfig-related stuff
+
* Tue Jan 14 2014 Jan Synáček <jsynacek at redhat.com> - 2:2.3.15-12
- fix bad URL
More information about the scm-commits
mailing list