[packages/heimdal/dev-7.3: 17/21] - dropped obsolete ftpd,rsh,telnetd inetd files

baggins baggins at pld-linux.org
Sat May 27 23:19:25 CEST 2017


commit 50d8bf88d75e9a0efd0b6b1369e0cb76194f5a83
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 20 15:56:33 2017 +0100

    - dropped obsolete ftpd,rsh,telnetd inetd files

 heimdal-ftpd.inetd    |  8 --------
 heimdal-rshd.inetd    |  8 --------
 heimdal-telnetd.inetd |  8 --------
 heimdal.spec          | 22 ++++++----------------
 4 files changed, 6 insertions(+), 40 deletions(-)
---
diff --git a/heimdal.spec b/heimdal.spec
index d91ca9f..1906de9 100644
--- a/heimdal.spec
+++ b/heimdal.spec
@@ -21,11 +21,8 @@ Source3:	%{name}-ipropd.init
 Source4:	%{name}-kcm.init
 Source5:	%{name}.sysconfig
 Source6:	%{name}-kcm.sysconfig
-Source7:	%{name}-krb5.conf
-Source8:	%{name}-ftpd.inetd
-Source9:	%{name}-rshd.inetd
-Source10:	%{name}-telnetd.inetd
-Source11:	%{name}-kadmind.inetd
+Source7:	%{name}-kadmind.inetd
+Source8:	%{name}-krb5.conf
 Patch0:		%{name}-hdb-ldap.patch
 Patch1:		%{name}-am_man_fixes.patch
 Patch3:		%{name}-dbpaths.patch
@@ -299,15 +296,8 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/ipropd
 install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/kcm
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/kcm
-
-cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/krb5.conf
-
-%if 0
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
-cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/rshd
-cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/telnetd
-%endif
-cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/kadmind
+cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/kadmind
+cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/krb5.conf
 
 for l in $RPM_BUILD_ROOT%{_libdir}/lib{asn1,gssapi,hcrypto,heimbase,heimntlm,hx509,kafs,krb5,roken,wind}.so ; do
 	lib=`basename $l`
@@ -681,9 +671,9 @@ fi
 %attr(755,root,root) %{_sbindir}/kfd
 %attr(755,root,root) %{_sbindir}/kpasswdd
 %attr(755,root,root) %{_sbindir}/kstash
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(754,root,root) /etc/rc.d/init.d/kpasswdd
+%attr(754,root,root) /etc/rc.d/init.d/heimdal
 %attr(754,root,root) /etc/rc.d/init.d/ipropd
+%attr(754,root,root) /etc/rc.d/init.d/kpasswdd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/heimdal
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/kadmind
 %attr(700,root,root) %dir %{_localstatedir}
diff --git a/heimdal-ftpd.inetd b/heimdal-ftpd.inetd
deleted file mode 100644
index ffc9472..0000000
--- a/heimdal-ftpd.inetd
+++ /dev/null
@@ -1,8 +0,0 @@
-SERVICE_NAME=ftp
-SOCK_TYPE=stream
-PROTOCOL=tcp
-PORT=21
-FLAGS=nowait
-USER=root
-SERVER=tcpd
-DAEMON=/usr/sbin/ftpd
diff --git a/heimdal-rshd.inetd b/heimdal-rshd.inetd
deleted file mode 100644
index bb38f07..0000000
--- a/heimdal-rshd.inetd
+++ /dev/null
@@ -1,8 +0,0 @@
-SERVICE_NAME=shell
-SOCK_TYPE=stream
-PROTOCOL=tcp
-PORT=514
-FLAGS=nowait
-USER=root
-SERVER=tcpd
-DAEMON=/usr/sbin/rshd
diff --git a/heimdal-telnetd.inetd b/heimdal-telnetd.inetd
deleted file mode 100644
index 49c6e6c..0000000
--- a/heimdal-telnetd.inetd
+++ /dev/null
@@ -1,8 +0,0 @@
-SERVICE_NAME=telnet
-SOCK_TYPE=stream
-PROTOCOL=tcp
-PORT=23
-FLAGS=nowait
-USER=root
-SERVER=tcpd
-DAEMON=/usr/sbin/telnetd
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/heimdal.git/commitdiff/08416d15b3ebeb603ccaa1fa8647376b4e5c7f78



More information about the pld-cvs-commit mailing list