SPECS (AC-branch): heimdal.spec - merge from HEAD: - added setuid...

glen glen at pld-linux.org
Mon Oct 2 19:18:34 CEST 2006


Author: glen                         Date: Mon Oct  2 17:18:34 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge from HEAD:
 - added setuid-patch from vendor (CVE-2006-3083 CVE-2006-3084)
 - added libadd patch
- rel 4

---- Files affected:
SPECS:
   heimdal.spec (1.120.2.2 -> 1.120.2.3) 

---- Diffs:

================================================================
Index: SPECS/heimdal.spec
diff -u SPECS/heimdal.spec:1.120.2.2 SPECS/heimdal.spec:1.120.2.3
--- SPECS/heimdal.spec:1.120.2.2	Sun May 21 18:27:15 2006
+++ SPECS/heimdal.spec	Mon Oct  2 19:18:29 2006
@@ -7,7 +7,7 @@
 Summary(pl):	Implementacja Heimdal systemu Kerberos V5
 Name:		heimdal
 Version:	0.7.2
-Release:	2
+Release:	4
 License:	Free
 Group:		Networking
 Source0:	ftp://ftp.pdc.kth.se/pub/heimdal/src/%{name}-%{version}.tar.gz
@@ -32,6 +32,8 @@
 Patch7:		%{name}-no-editline.patch
 Patch8:		%{name}-gcc4.patch
 Patch9:		%{name}-db4.patch
+Patch10:	%{name}-libadd.patch
+Patch11:	ftp://ftp.pdc.kth.se/pub/heimdal/src/%{name}-0.7.2-setuid-patch.txt
 URL:		http://www.pdc.kth.se/heimdal/
 %{?with_x11:BuildRequires:	XFree86-devel}
 BuildRequires:	autoconf
@@ -46,6 +48,7 @@
 BuildRequires:	openldap-devel >= 2.3.0
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	readline-devel >= 5.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	texinfo
 Requires:	%{name}-libs = %{version}-%{release}
 Conflicts:	krb5-lib
@@ -287,6 +290,8 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 rm -f acinclude.m4
@@ -303,7 +308,7 @@
 	--enable-new-des3-code \
 	--with-openldap=/usr \
 	--with-readline=/usr \
-        --with%{!?with_x11:out}-x \
+		--with%{!?with_x11:out}-x \
 	--with-ipv6
 
 %{__make}
@@ -567,6 +572,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120.2.3  2006/10/02 17:18:29  glen
+- merge from HEAD:
+ - added setuid-patch from vendor (CVE-2006-3083 CVE-2006-3084)
+ - added libadd patch
+- rel 4
+
 Revision 1.120.2.2  2006/05/21 16:27:15  glen
 - missing patch9 (db4)
 
@@ -574,7 +585,7 @@
 - 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 [CVE-2006-0677]
+- 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
@@ -615,7 +626,7 @@
 
 Revision 1.107  2005/06/27 15:59:28  undefine
 - up to 0.6.5, bugfix release
-[fixes CAN-2005-2040]
+  [fixes CAN-2005-2040]
 
 Revision 1.106  2005/05/15 21:39:17  undefine
 - kpasswdd daemon
@@ -626,7 +637,7 @@
 - heimdal-ftp obsoletes ftp
 
 Revision 1.104  2005/05/09 23:17:26  wiget
-- %%debug ready glob rename
+- %debug ready glob rename
 
 Revision 1.103  2005/04/25 11:02:48  wiget
 - rename libroken internal glob/globfree to heimdal_glob/heimdal_globfree (fixes sig11 in racoon)
@@ -812,7 +823,7 @@
   man pages.
 
 Revision 1.48  2002/11/27 21:10:38  juandon
-- new %%doc
+- new %doc
 
 Revision 1.47  2002/11/25 14:16:44  ankry
 - massive attack: no need for 755 for *.la
@@ -822,7 +833,7 @@
 - added am_fixes patch.
 
 Revision 1.45  2002/04/25 16:33:29  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.44  2002/02/23 02:30:45  kloczek
 - adapterized.
@@ -832,7 +843,7 @@
   Group field using gettext).
 
 Revision 1.42  2002/01/18 02:13:16  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.41  2001/10/03 16:43:28  filon
 - changed req %{name}-lib to %{name}-devel in static subpkg
@@ -845,7 +856,7 @@
 - server Prereq: /sbin/chkconfig
 - the rest of pl translations
 - release 2
-NOTE: IMO some descriptions should contain notice that kerberos is used
+  NOTE: IMO some descriptions should contain notice that kerberos is used
 
 Revision 1.38  2001/09/07 22:14:14  kloczek
 - updated to 0.4e.
@@ -860,7 +871,7 @@
 - typo on removing glob.h.
 
 Revision 1.33  2001/07/23 10:45:26  kloczek
-- removed %%{_includedir}/glob.h (another conflict with glibc-devel).
+- removed %{_includedir}/glob.h (another conflict with glibc-devel).
 
 Revision 1.32  2001/07/23 09:12:36  kloczek
 - added e2fsprogs-devel to Requires list in devel subpackage.
@@ -880,7 +891,7 @@
 - Requires for rc-scripts changed to Prereq.
 
 Revision 1.27  2000/12/05 16:41:39  wiget
-fix %%post/%%postun scripts
+- fix %post/%postun scripts
 
 Revision 1.26  2000/11/01 00:30:31  kloczek
 - updated to 0.3c,
@@ -896,13 +907,13 @@
 - login package Provides: login
 
 Revision 1.22  2000/06/09 07:54:42  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.21  2000/06/09 07:22:58  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.20  2000/05/17 23:08:37  kloczek
-- removed enable LDAP support in %%configure (not work now).
+- removed enable LDAP support in %configure (not work now).
 
 Revision 1.19  2000/05/17 23:07:25  kloczek
 - updated to 0.2t,
@@ -954,7 +965,7 @@
 - added URL.
 
 Revision 1.8  1999/09/24 10:45:02  pius
-- moved running of /usr/sbin/fix-info-dir to %%postun
+- moved running of /usr/sbin/fix-info-dir to %postun
 - release up
 
 Revision 1.7  1999/09/19 09:41:26  pius
@@ -965,7 +976,3 @@
 
 Revision 1.5  1999/07/12 23:05:58  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Sat Jul 03 1999 Arkadiusz Miśkiewicz <misiek at pld.org.pl>
-  [0.1g-1]
-- initial spec release
================================================================

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



More information about the pld-cvs-commit mailing list