SPECS (AC-branch): heimdal.spec - merge changes from HEAD; rel 2

glen glen at pld-linux.org
Sun May 21 18:01:33 CEST 2006 

Author: glen                         Date: Sun May 21 16:01:33 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge changes from HEAD; rel 2

---- Files affected:
SPECS:
   heimdal.spec (1.120 -> 1.120.2.1) 

---- Diffs:

================================================================
Index: SPECS/heimdal.spec
diff -u SPECS/heimdal.spec:1.120 SPECS/heimdal.spec:1.120.2.1
--- SPECS/heimdal.spec:1.120	Wed Feb  8 21:18:19 2006
+++ SPECS/heimdal.spec	Sun May 21 18:01:27 2006
@@ -7,7 +7,7 @@
 Summary(pl):	Implementacja Heimdal systemu Kerberos V5
 Name:		heimdal
 Version:	0.7.2
-Release:	1
+Release:	2
 License:	Free
 Group:		Networking
 Source0:	ftp://ftp.pdc.kth.se/pub/heimdal/src/%{name}-%{version}.tar.gz
@@ -56,26 +56,26 @@
 
 %description
 Heimdal is a free implementation of Kerberos 5. The goals are to:
-   - have an implementation that can be freely used by anyone
-   - be protocol compatible with existing implementations and, if not in
-     conflict, with RFC 1510 (and any future updated RFC)
-   - be reasonably compatible with the M.I.T Kerberos V5 API
-   - have support for Kerberos V5 over GSS-API (RFC1964)
-   - include the most important and useful application programs (rsh,
-     telnet, popper, etc.)
-   - include enough backwards compatibility with Kerberos V4
-   - IPv6 support
+- have an implementation that can be freely used by anyone
+- be protocol compatible with existing implementations and, if not in
+  conflict, with RFC 1510 (and any future updated RFC)
+- be reasonably compatible with the M.I.T Kerberos V5 API
+- have support for Kerberos V5 over GSS-API (RFC1964)
+- include the most important and useful application programs (rsh,
+  telnet, popper, etc.)
+- include enough backwards compatibility with Kerberos V4
+- IPv6 support
 
 %description -l pl
 Heimdal jest darmową implementacją Kerberosa 5. Główne zalety to:
-   - implementacja, która może być używana przez każdego
-   - kompatybilność na poziomie protokołu z istniejącymi implementacjami
-   - racjonalna kompatybilność z M.I.T Kerberos V5 API
-   - wsparcie dla Kerberosa 5 poprzez GSS-API (RFC1964)
-   - zawiera większość istotnych i użytecznych aplikacji (rsh, telnet,
-     popper, etc.)
-   - zawiera wystarczającą kompatybilność z Kerberos V4
-   - wsparcie dla IPv6
+- implementacja, która może być używana przez każdego
+- kompatybilność na poziomie protokołu z istniejącymi implementacjami
+- racjonalna kompatybilność z M.I.T Kerberos V5 API
+- wsparcie dla Kerberosa 5 poprzez GSS-API (RFC1964)
+- zawiera większość istotnych i użytecznych aplikacji (rsh, telnet,
+  popper, etc.)
+- zawiera wystarczającą kompatybilność z Kerberos V4
+- wsparcie dla IPv6
 
 %package server
 Summary:	Kerberos Server
@@ -129,8 +129,8 @@
 Summary(pl):	Klient protokołu FTP
 Group:		Applications/Networking
 Requires:	%{name}-libs = %{version}-%{release}
-Conflicts:	heimdal-clients
 Obsoletes:	ftp
+Conflicts:	heimdal-clients
 
 %description ftp
 The FTP package provides the standard UNIX command-line FTP client
@@ -168,8 +168,8 @@
 Summary(pl):	Klient usługi telnet
 Group:		Applications/Networking
 Requires:	%{name}-libs = %{version}-%{release}
-Obsoletes:	telnet
 Provides:	telnet
+Obsoletes:	telnet
 Conflicts:	heimdal-clients
 
 %description telnet
@@ -285,12 +285,12 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 rm -f acinclude.m4
 %{__libtoolize}
 %{__aclocal} -I cf
-autoupdate
 %{__autoconf}
 %{__automake}
 # glibc glob() has no support to GLOB_QUOTE and GLOB_LIMIT/GLOB_MAXPATH
@@ -344,80 +344,46 @@
 
 %post server
 /sbin/chkconfig --add heimdal
-if [ -f /var/lock/subsys/heimdal ]; then
-	/etc/rc.d/init.d/heimdal restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/heimdal start\" to start heimdal daemon."
-fi
+%service heimdal restart "heimdal daemon"
 
 /sbin/chkconfig --add kpasswdd
-if [ -f /var/lock/subsys/kpasswdd ]; then
-	/etc/rc.d/init.d/kpasswdd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/kpasswdd start\" to start heimdal password changing daemon."
-fi
+%service kpasswdd restart "heimdal password changing daemon"
 
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %preun server
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/heimdal ]; then
-		/etc/rc.d/init.d/heimdal stop >&2
-	fi
+	%service heimdal stop
 	/sbin/chkconfig --del heimdal
-fi
 
-if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/kpasswdd ]; then
-		/etc/rc.d/init.d/kpasswdd stop >&2
-	fi
+	%service kpasswdd stop
 	/sbin/chkconfig --del kpasswdd
-fi
 
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
+	%service -q rc-inetd reload
 fi
 
 %post ftpd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun ftpd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload
+if [ "$1" = "0" ]; then
+	%service -q rc-inetd reload
 fi
 
 %post rshd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun rshd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload
+if [ "$1" = "0" ]; then
+	%service -q rc-inetd reload
 fi
 
 %post telnetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun telnetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload
+if [ "$1" = "0" ]; then
+	%service -q rc-inetd reload
 fi
 
 %post libs
@@ -600,8 +566,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120.2.1  2006/05/21 16:01:27  glen
+- merge changes from HEAD; rel 2
+
 Revision 1.120  2006/02/08 20:18:19  qboosh
-- updated to 0.7.2 (fixes CVE-2006-0582 and telnetd DoS)
+- updated to 0.7.2 (fixes CVE-2006-0582 and telnetd DoS [CVE-2006-0677]
 
 Revision 1.119  2006/02/05 20:23:23  areq
 - fix without X11
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/heimdal.spec?r1=1.120&r2=1.120.2.1&f=u

More information about the pld-cvs-commit mailing list